diff --git a/src/Main.java b/src/Main.java
index 0a9dc74..d9f90a7 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -29,7 +29,8 @@ public class Main {
 		
 		//getting the pieces on the board
 		ArrayList<Piece> allPieces=testBoard.getPieces();
-		for (Piece piece:allPieces) {
+		for (int i=0;i<allPieces.size();i++) {
+			Piece piece=allPieces.get(i);
 			System.out.println((piece.isWhite() ? "White ":"Black ")+ piece.getType().getSummary()+" located at "+ piece.getX()+ "," + piece.getY());	
 		}
 		
diff --git a/src/backend/Board.java b/src/backend/Board.java
index 98fb398..ce4ed4b 100644
--- a/src/backend/Board.java
+++ b/src/backend/Board.java
@@ -100,11 +100,13 @@ public class Board {
 			//when no piece is selected
 			if(clickedPiece!=null && clickedPiece.isWhite()==isTurnWhite) {
 				chosenPiece=clickedPiece;
+				highlightedPossibleMoves(clickedPiece);
 			}
 		}
 		else { //if a piece is already selected
 			if(isSelected(x,y)) {
 				chosenPiece=null; //unselect the chosen piece to revert to normal state
+				highlightedSquares.clear();			
 			}
 			else { //move selected piece to new position using MovePiece logics
 				MovePiece movement= new MovePiece(chosenPiece, this);
@@ -122,6 +124,7 @@ public class Board {
 				}
 				if(movementSuccess) {
 					chosenPiece=null;
+					highlightedSquares.clear();
 					turnNumber++;
 					isTurnWhite=! isTurnWhite;
 				} else { //invalid move 
@@ -166,6 +169,11 @@ public class Board {
 	}
 	
 	/* The following methods require more work ! */
+	
+	private void highlightedPossibleMoves(Piece piece) {
+		highlightedSquares.clear();
+		highlightedSquares.addAll(MoveHighlighter.getPossibleMoves(piece, this));
+	}
 
 	public boolean isHighlighted(int x, int y) {
 		for(int i=0; i<highlightedSquares.size();i++) { //loops through list of highlighted squares
diff --git a/src/backend/MoveHighlighter.java b/src/backend/MoveHighlighter.java
index 29254fb..29a9e5b 100644
--- a/src/backend/MoveHighlighter.java
+++ b/src/backend/MoveHighlighter.java
@@ -7,11 +7,13 @@ public class MoveHighlighter {
 		ArrayList<int[]> validMoves = new ArrayList<int[]>();
 		MovePiece movement = new MovePiece(piece, board);
 		PieceType type= piece.getType();
-		for(int x=0; x<board.getHeight();x++) {
+		
+		for(int x=0; x<board.getHeight();x++) { //looping through each square space
 			for(int y=0; y<board.getHeight();y++) {
 				boolean valid=false;
+				
 				if(type==PieceType.Pawn) {
-					valid=movement.movePawn(x, y);
+					valid=movement.movePawnSimulate(x, y);
 				} else if(type==PieceType.Rook) {
 					valid=movement.moveRook(x, y);
 				}else if(type==PieceType.King) {
diff --git a/src/backend/MovePiece.java b/src/backend/MovePiece.java
index 0d23cc0..e13c9fa 100644
--- a/src/backend/MovePiece.java
+++ b/src/backend/MovePiece.java
@@ -167,8 +167,31 @@ public class MovePiece {
         }
         return false;
     }
+  //Pawn movement logic simulation: only checking where the piece can go to avoid changing the game state
+    public boolean movePawnSimulate(int x, int y) {
+        int currentX = piece.getX();
+        int currentY = piece.getY();
+        boolean isWhite = piece.isWhite();
+        int direction = isWhite ? -1 : 1;
+        boolean firstMove = isWhite ? currentY == 6 : currentY == 1;
+
+        // Same logic as movePawn but no actual move
+        if (x == currentX && y == currentY + direction && board.getPiece(x, y) == null) {
+            return true;
+        } else if (x == currentX && y == currentY + (2 * direction) && firstMove &&
+                   board.getPiece(x, y) == null && board.getPiece(x, currentY + direction) == null) {
+            return true;
+        } else if (Math.abs(x - currentX) == 1 && y == currentY + direction &&
+                   board.getPiece(x, y) != null && board.getPiece(x, y).isWhite() != isWhite) {
+            return true;
+        }
+        return false;
+    }
 }
     
+
+
+
     
   /*  public void addPossibleMoves() {
         switch (piece.getType()) {