diff --git a/OOP_2B1_Project/src/backend/Board.java b/OOP_2B1_Project/src/backend/Board.java
index 4001626..e7aae1f 100644
--- a/OOP_2B1_Project/src/backend/Board.java
+++ b/OOP_2B1_Project/src/backend/Board.java
@@ -20,6 +20,7 @@ public class Board {
 	private ArrayList<ArrayList<Boolean>> possibleMoves = new ArrayList<>();
 	private LinkedList<BoardHistory> boardHistory = new LinkedList<>();
 	public boolean timerSwitch = false;
+	public boolean timerStart = true;
 	
 	public Board(int colNum, int lineNum) {
 		this.width = colNum;
@@ -214,6 +215,7 @@ public class Board {
 
 	public void userTouch(int x, int y) {
 		if ((this.select == false && board.get(y).get(x) != null && this.board.get(y).get(x).isWhite() == turnColor) || (select == true && board.get(y).get(x) != null && board.get(y).get(x).isWhite() == board.get(ym).get(xm).isWhite())) {
+			timerStart = false;
 			this.xm = x;
 			this.ym = y;
 			select = true;
@@ -407,7 +409,10 @@ public class Board {
 	public void setTimerSwitch(boolean timerSwitch) {
 		this.timerSwitch = timerSwitch;
 	}
-
+	
+	public boolean getTimerStart() {
+		return timerStart;
+	}
 }
 
 /////
diff --git a/OOP_2B1_Project/src/backend/Game.java b/OOP_2B1_Project/src/backend/Game.java
index 8ad525c..1885f05 100644
--- a/OOP_2B1_Project/src/backend/Game.java
+++ b/OOP_2B1_Project/src/backend/Game.java
@@ -65,6 +65,9 @@ public class Game extends Thread {
 			System.out.println("Click out of bounds");
 			return;
 		}
+		if (board.getTimerStart()) {
+			mjf.startTimer(board.isTurnColor());
+		}
 		if(!isAITurn()) {
 			if (aiPlayer.getAllLegalMoves(board.getBoard(), board.isTurnWhite(),board.getLastMove()).size() != 0){
 				board.userTouch(x, y);
diff --git a/OOP_2B1_Project/src/windowInterface/MyInterface.java b/OOP_2B1_Project/src/windowInterface/MyInterface.java
index 0ffcd00..91b3632 100644
--- a/OOP_2B1_Project/src/windowInterface/MyInterface.java
+++ b/OOP_2B1_Project/src/windowInterface/MyInterface.java
@@ -181,7 +181,6 @@ public class MyInterface extends JFrame {
 		if (timerManager == null)
 		    timerManager = new TimerManager(whiteTimerLabel, blackTimerLabel, () -> gameOverByTimeout(), time);
 		timerManager.reset(time);
-		timerManager.start(true); // white starts
 	}
 	public void clickButtonAdder() {
 		panelDraw.toggleAdderMode();
@@ -376,7 +375,10 @@ public class MyInterface extends JFrame {
 
 	    return 1; 
 	}
-
+	
+	public void startTimer(boolean isWhite) {
+		timerManager.start(isWhite);
+	}
 
 	
 	public void gameOverByTimeout() {