diff --git a/pom.xml b/pom.xml
index ba8efba..ea507de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
 		<version>1.0.8</version>
 	</parent>
 	<artifactId>jchess-core</artifactId>
-	<version>0.0.7-SNAPSHOT</version>
+	<version>0.0.8-SNAPSHOT</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/src/main/java/com/fathzer/jchess/GameBuilders.java b/src/main/java/com/fathzer/jchess/GameBuilders.java
index c7d2a8f..dcf3d5c 100644
--- a/src/main/java/com/fathzer/jchess/GameBuilders.java
+++ b/src/main/java/com/fathzer/jchess/GameBuilders.java
@@ -1,13 +1,14 @@
 package com.fathzer.jchess;
 
-import com.fathzer.games.GameBuilder;
+import java.util.function.Supplier;
+
 import com.fathzer.jchess.chess960.Chess960Board;
 import com.fathzer.jchess.chess960.StartPositionGenerator;
 import com.fathzer.jchess.fen.FENUtils;
 
 public class GameBuilders {
-	public static final GameBuilder<Board<Move>> STANDARD = () -> FENUtils.from(FENUtils.NEW_STANDARD_GAME);
-	public static final GameBuilder<Board<Move>> CHESS960 = () -> new Chess960Board(StartPositionGenerator.INSTANCE.get());
+	public static final Supplier<Board<Move>> STANDARD = () -> FENUtils.from(FENUtils.NEW_STANDARD_GAME);
+	public static final Supplier<Board<Move>> CHESS960 = () -> new Chess960Board(StartPositionGenerator.INSTANCE.get());
 	
 	private GameBuilders() {
 		super();
diff --git a/src/test/java/com/fathzer/jchess/generic/ChessBoardTest.java b/src/test/java/com/fathzer/jchess/generic/ChessBoardTest.java
index 53ce3a0..6f05b92 100644
--- a/src/test/java/com/fathzer/jchess/generic/ChessBoardTest.java
+++ b/src/test/java/com/fathzer/jchess/generic/ChessBoardTest.java
@@ -410,7 +410,7 @@ void testInsufficientMaterial() {
 
 	@Test
 	void drawByRepetitionTest() {
-		Board<Move> board = GameBuilders.STANDARD.newGame();
+		Board<Move> board = GameBuilders.STANDARD.get();
 		final Move kwf = move(board,"b1", "c3");
 		final Move kwb = move(board,"c3", "b1");
 		final Move kbf = move(board, "b8", "c6");
diff --git a/src/test/java/com/fathzer/jchess/pgn/PGNWriterTest.java b/src/test/java/com/fathzer/jchess/pgn/PGNWriterTest.java
index 19413ab..cb839f9 100644
--- a/src/test/java/com/fathzer/jchess/pgn/PGNWriterTest.java
+++ b/src/test/java/com/fathzer/jchess/pgn/PGNWriterTest.java
@@ -17,7 +17,7 @@ class PGNWriterTest implements MoveBuilder {
 
 	@Test
 	void test() {
-		final Board<Move> board = GameBuilders.STANDARD.newGame();
+		final Board<Move> board = GameBuilders.STANDARD.get();
 		final GameHistory history = new GameHistory(board);
 		history.add(move(board, "e2", "e4"));
 		history.add(move(board, "e7", "e5"));
@@ -47,7 +47,7 @@ void test() {
 	
 	@Test
 	void bug20231025() {
-		final Board<Move> board = GameBuilders.STANDARD.newGame();
+		final Board<Move> board = GameBuilders.STANDARD.get();
 		final GameHistory history = new GameHistory(board);
 		history.add(move(board, "c2", "c4"));
 		history.add(move(board, "g8", "f6"));