diff --git a/OOP_3B5_Project/src/backend/Board.java b/OOP_3B5_Project/src/backend/Board.java
index 444f6d7..6369987 100644
--- a/OOP_3B5_Project/src/backend/Board.java
+++ b/OOP_3B5_Project/src/backend/Board.java
@@ -252,15 +252,7 @@ public class Board {
 			isAPieceHere = move.isRookMoveValid(x, y, color, selectX, selectY);
 			
 	}	else if (type == PieceType.Queen) {
-			for(int i = 1; i < 8;i++) {
-			
-				if(selectX == x+i && selectY == y || selectX == x && selectY == y+i || 
-				   selectX == x-i && selectY == y || selectX == x && selectY == y-i || 
-				   selectX == x+i && selectY == y+i || selectX == x-i && selectY == y-i || 
-				   selectX == x-i && selectY == y+i || selectX == x+i && selectY == y-i) {				
-					isAPieceHere = true;
-				}
-			}
+			isAPieceHere = (move.isBishopMoveValid(x, y, color, selectX, selectY) || move.isRookMoveValid(x, y, color, selectX, selectY));
 		
 	}	else if (type == PieceType.Knight) {