diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayerHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayerHandler.java
index 636db5ee..88b2351d 100644
--- a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayerHandler.java
+++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardLayerHandler.java
@@ -33,6 +33,7 @@ public class CardLayerHandler {
     private final Set<CardControl> selectableCards = new HashSet<>();
 
     private BonusCard cardSelect = null;
+    private boolean show = false;
 
     public CardLayerHandler(MdgaApp app, Texture2D backTexture) {
         this.app = app;
@@ -64,11 +65,14 @@ public void rollDice(int rollNum, Runnable actionAfter) {
     }
 
     public void showDice() {
+        if(show) return;
+        show = true;
         cardLayer.addSpatial(diceControl.getSpatial());
         diceControl.spin();
     }
 
     public void hideDice() {
+        show = false;
         diceControl.hide();
     }
 
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java
index 63d6b26d..19c631ef 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java
@@ -23,7 +23,7 @@ public RollDiceState(ClientState parent, ClientGameLogic logic) {
 
     @Override
     public void enter() {
-        //logic.addNotification(new DiceNowNotification());
+        logic.addNotification(new DiceNowNotification());
     }
 
     @Override
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
index 276ee777..e7e06348 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
@@ -94,8 +94,8 @@ public Game() {
      * This method initializes the draw pile with the predefined number of bonus cards.
      */
     private void initializeDrawPile() {
-        this.addBonusCards(new TurboCard(), AMOUNT_OF_TURBO_CARDS);
-//        this.addBonusCards(new SwapCard(), AMOUNT_OF_SWAP_CARDS);
+//        this.addBonusCards(new TurboCard(), AMOUNT_OF_TURBO_CARDS);
+        this.addBonusCards(new SwapCard(), AMOUNT_OF_SWAP_CARDS);
 //        this.addBonusCards(new ShieldCard(), AMOUNT_OF_SHIELD_CARDS);
         Collections.shuffle(this.drawPile);
     }