diff --git a/Projektgruppe_175/src/gui/components/JokerPanel.java b/Projektgruppe_175/src/gui/components/JokerPanel.java
index 1e6dd61..5940b7e 100644
--- a/Projektgruppe_175/src/gui/components/JokerPanel.java
+++ b/Projektgruppe_175/src/gui/components/JokerPanel.java
@@ -106,9 +106,9 @@ public class JokerPanel extends JPanel implements MouseListener{
 			if(choice == 1)
 				return;
 			game.getCurrentPlayer().addTroops(5);
+			game.getCurrentPlayer().setJoker(index, JokerTypes.ADD_TROOPS_USED);
 			gv.updateStats();
 			gv.repaint();
-			setJoker(index, JokerTypes.ADD_TROOPS_USED);
 		}
 		
 		if(index == 1) {
@@ -120,9 +120,8 @@ public class JokerPanel extends JPanel implements MouseListener{
 			 if(choice == 1)
 				 return;
 			 
-			 System.out.println("Joker used");
 			 map.setIsChoosingJoker(true);
-			 setJoker(index, JokerTypes.SCARE_TROOPS_USED);
+			 game.getCurrentPlayer().setJoker(index, JokerTypes.SCARE_TROOPS_USED);
 			 
 		}
 	}
@@ -145,8 +144,7 @@ public class JokerPanel extends JPanel implements MouseListener{
 		
 		
 		for(int i = 0; i < jokers.length; i++) {
-			System.out.print("i: " + i + jokers[i] + " ");
-			g.drawImage(resources.getJokers()[jokers[i].ordinal()], 9 + 32 * i + 10 * i, 5, 32, 32, null);
+			g.drawImage(resources.getJokers()[game.getCurrentPlayer().getJokers()[i].ordinal()], 9 + 32 * i + 10 * i, 5, 32, 32, null);
 		}
 		
 	}
@@ -154,10 +152,9 @@ public class JokerPanel extends JPanel implements MouseListener{
 
 	@Override
 	public void mouseClicked(MouseEvent e) {
-		System.out.println("X: " + e.getX() + " Y: " + e.getY());
 		if(e.getX() <= 41 && jokers[0] == JokerTypes.ADD_TROOPS) {
 			playJoker(0);
-		} else
+		} else if(e.getX() > 50 && e.getX() < 100 && jokers[1] == JokerTypes.SCARE_TROOPS)
 			playJoker(1);
 		
 	}