diff --git a/Projekte/.run/MdgaApp.run.xml b/Projekte/.run/MdgaApp.run.xml
index 776076f1..cfb2a51b 100644
--- a/Projekte/.run/MdgaApp.run.xml
+++ b/Projekte/.run/MdgaApp.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="MdgaApp" type="Application" factoryName="Application" singleton="false" nameIsGenerated="true">
-    <option name="ALTERNATIVE_JRE_PATH" value="temurin-20" />
+    <option name="ALTERNATIVE_JRE_PATH" value="21" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="pp.mdga.client.MdgaApp" />
     <module name="Projekte.mdga.client.main" />
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java
index ad861a55..bd5f7cde 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java
@@ -51,12 +51,16 @@ public void received(MoveMessage msg){
         Piece piece = logic.getGame().getPieceThroughUUID(msg.getPiece().getUuid());
         int i = logic.getGame().getBoard().getInfieldIndexOfPiece(piece);
         LOGGER.log(System.Logger.Level.INFO, "Received MoveMessage with start index: " + i);
-        logic.addNotification(new MovePieceNotification(msg.getPiece().getUuid(), i, msg.getTargetIndex()));
-        Piece occ = logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].moveOccupant(piece);
+
+        Piece occ = logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].getOccupant();
         if (occ != null){
             logic.getGame().getPlayerByColor(occ.getColor()).addWaitingPiece(occ);
             logic.addNotification(new ThrowPieceNotification(occ.getUuid(), piece.getColor()));
         }
+
+        logic.addNotification(new MovePieceNotification(msg.getPiece().getUuid(), i, msg.getTargetIndex()));
+        logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].setOccupant(msg.getPiece());
+
         parent.getParent().setState(parent.getParent().getMovePiece());
     }
 }
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java
index 56072b59..4f001991 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java
@@ -43,12 +43,15 @@ public void selectPiece(Piece piece){
     @Override
     public void received(MoveMessage msg){
         Piece pieceToMove = logic.getGame().getPieceThroughUUID(msg.getPiece().getUuid());
-        Piece occ = logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].moveOccupant(pieceToMove);
-        logic.addNotification(new MovePieceNotification(pieceToMove.getUuid(), logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getStartNodeIndex(), true));
+        Piece occ = logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].getOccupant();
         if (occ != null){
             logic.getGame().getPlayerByColor(occ.getColor()).addWaitingPiece(occ);
-            logic.addNotification(new ThrowPieceNotification(occ.getUuid(), pieceToMove.getColor()));
+            logic.addNotification(new ThrowPieceNotification(occ.getUuid(), msg.getPiece().getColor()));
         }
+
+        logic.addNotification(new MovePieceNotification(pieceToMove.getUuid(), logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getStartNodeIndex(), true));
+        logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].setOccupant(msg.getPiece());
+
         pieceToMove.setState(PieceState.ACTIVE);
         parent.getParent().setState(parent.getParent().getMovePiece());
     }
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Board.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Board.java
index 58be0117..fed99575 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Board.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Board.java
@@ -85,6 +85,7 @@ public int getInfieldIndexOfPiece(Piece piece) {
                 }
             }
         }
+
         return -1;
     }
 
diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/WaitingPieceState.java b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/WaitingPieceState.java
index ce54a5f2..241bbbf6 100644
--- a/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/WaitingPieceState.java
+++ b/Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/WaitingPieceState.java
@@ -32,7 +32,7 @@ public WaitingPieceState(ChoosePieceState choosePieceAutomaton, ServerGameLogic
      */
     @Override
     public void enter() {
-        LOGGER.log(System.Logger.Level.DEBUG, "Entered WaitingPieceState state.");
+        LOGGER.log(System.Logger.Level.INFO, "Entered WaitingPieceState state.");
         this.piece = logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getWaitingPiece();
         logic.getServerSender().send(logic.getGame().getActivePlayerId(), new WaitPieceMessage(this.piece.getUuid()));
     }
@@ -41,10 +41,12 @@ public void enter() {
     public void received(RequestMoveMessage msg, int from){
         if (msg.getPiece().equals(this.piece)) {
             piece.setState(PieceState.ACTIVE);
-            Piece thrownOcc = logic.getGame().getBoard().getInfield()[logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getStartNodeIndex()].moveOccupant(this.piece);
+            Piece thrownOcc = logic.getGame().getBoard().getInfield()[logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getStartNodeIndex()].getOccupant();
             if (thrownOcc != null) {
+                logic.getServerSender().broadcast(new MoveMessage());
                 logic.getGame().getPlayerByColor(thrownOcc.getColor()).addWaitingPiece(thrownOcc);
             }
+            logic.getGame().getBoard().getInfield()[logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getStartNodeIndex()].setOccupant(this.piece);
             logic.getServerSender().broadcast(new MoveMessage(this.piece, false, logic.getGame().getPlayerById(logic.getGame().getActivePlayerId()).getStartNodeIndex()));
             this.choosePieceAutomaton.getTurnAutomaton().setCurrentState(this.choosePieceAutomaton.getTurnAutomaton().getMovePieceState());
         }