diff --git a/OOP_3B5_Project/src/backend/Board.java b/OOP_3B5_Project/src/backend/Board.java
index 737d717..2e47993 100644
--- a/OOP_3B5_Project/src/backend/Board.java
+++ b/OOP_3B5_Project/src/backend/Board.java
@@ -256,30 +256,49 @@ public class Board {
 				}
             	if(selectX + i == x && selectY + i == y) { // iterate trough i up until i as k = i, it is needed to not light up the pieces of the same color a the played piece
         	         isAPieceHere = true;//set the boolean var to true
-            			}
+            }
 				
 				
 			
-		}   k = 8;
-			for (int i = 1; i < k; i++) {
+			}k = 8; 
+	        for (int i = 1; i < k; i++) {
 	            if (getPiece(selectX - i, selectY - i) != null) {
-	                k = i;
-	                break;
-	            }
+	            	if (color != getPiece(selectX - i, selectY - i).isWhite()) {
+	            		k = i+1;
+	            		if (selectX - i == x && selectY - i == y) {
+	    	                isAPieceHere = true;
+	            		}
+	                	break;
+	                	
+	            	}else{
+	            		k = i;
+	            		break;
+	           }         
+	        }	
 	            if (selectX - i == x && selectY - i == y) {
-	                isAPieceHere = true;	                
+	                isAPieceHere = true;
 	            }
-	    }   k = 8;
+	            
+	        }k = 8; 
 	        for (int i = 1; i < k; i++) {
 	            if (getPiece(selectX - i, selectY + i) != null) {
-	                k = i;
-	                break;
-	            }
+	            	if (color != getPiece(selectX - i, selectY + i).isWhite()) {
+	            		k = i+1;
+	            		if (selectX - i == x && selectY + i == y) {
+	    	                isAPieceHere = true;
+	            		}
+	                	break;
+	                	
+	            	}else{
+	            		k = i;
+	            		break;
+	           }         
+	        }	
 	            if (selectX - i == x && selectY + i == y) {
 	                isAPieceHere = true;
-	                
 	            }
-	    }   k = 8; 
+	        }    
+	        k = 8; 
 	        for (int i = 1; i < k; i++) {
 	            if (getPiece(selectX + i, selectY - i) != null) {
 	            	if (color != getPiece(selectX + i, selectY - i).isWhite()) {