diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java
index 82a7d1dc..002d7e7e 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java
@@ -48,8 +48,6 @@ public void received(DieMessage msg) {
         else {
             logic.addNotification(new RollDiceNotification(logic.getGame().getActiveColor(), msg.getDiceEye()));
         }
-//        logic.addNotification(new RollDiceNotification(logic.getGame().getActiveColor(), logic.getGame().getDiceEyes()));
-
 
         //stats
         if (msg.getDiceEye() == 6) {
@@ -76,13 +74,6 @@ public void received(ActivePlayerMessage msg) {
         }
     }
 
-//    @Override
-//    public void received(DrawCardMessage msg){
-//        logic.addNotification(new DrawCardNotification(logic.getGame().getActiveColor(), msg.getCard().getCard()));
-//        logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getPlayerStatistic().increaseActivatedBonusNodes();
-//        logic.getGame().getGameStatistics().increaseActivatedBonusNodes();
-//    }
-
     @Override
     public void received(MoveMessage msg) {
         Piece piece = logic.getGame().getPieceThroughUUID(msg.getPiece().getUuid());
@@ -111,6 +102,7 @@ public void received(MoveMessage msg) {
             //set new node
             logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].setOccupant(piece);
         }
+        System.out.println("send AnimationEndMessage");
         logic.getGame().setTurboFlag(false);
         parent.setState(parent.getAnimation());
     }
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PlayPowerCardState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PlayPowerCardState.java
index d67f8b03..38c7b2e4 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PlayPowerCardState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/PlayPowerCardState.java
@@ -24,12 +24,12 @@ public PlayPowerCardState(ClientState parent, ClientGameLogic logic) {
 
     @Override
     public void enter() {
-        if(playCardMessage.getCard() instanceof SwapCard) {
+        if(playCardMessage.getCard().getCard().equals(BonusCard.SWAP)) {
             extraAnimationCounter++;
         }
 
         logic.addNotification(new PlayCardNotification(logic.getGame().getActiveColor() , playCardMessage.getCard().getCard()));
-
+        logic.getGame().getActivePlayer().removeHandCard(playCardMessage.getCard());
         handlePowerCard(playCardMessage);
     }