diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index b9e655d9..89c8ec7c 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -319,12 +319,7 @@ public class MockRace extends Race {
         //Checks if the current boat has finished the race or not.
         boolean finish = this.isLastLeg(boat.getCurrentLeg());
 
-        if (!finish && totalElapsedMilliseconds >= updatePeriodMilliseconds && boat.isSailsOut()) {
-
-//            if (boat.getCurrentSpeed() == 0) {
-//                newOptimalVMG(boat);
-//                boat.setBearing(boat.calculateBearingToNextMarker());
-//            }
+        if (!finish && totalElapsedMilliseconds >= updatePeriodMilliseconds & boat.isSailsOut()) {
 
             setBoatSpeed(boat);
 
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
index a7985c6e..e77526d4 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
@@ -111,8 +111,8 @@ public class RaceController extends Controller {
             ControlKey controlKey = keyFactory.getKey(codeString);
             if(controlKey != null) {
                 try {
-                    controllerClient.sendKey(controlKey);
                     controlKey.onAction();  // Change key state if applicable
+                    controllerClient.sendKey(controlKey);
                     event.consume();
                 } catch (IOException e) {
                     e.printStackTrace();
diff --git a/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java b/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
index fccb037c..1acfadba 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
@@ -67,8 +67,8 @@ public class ControllerServer extends Observable implements Runnable {
                     action = boatActionDecoder.getBoatAction();
 
                     // Notify observers of most recent action
-                    this.notifyObservers();
                     this.setChanged();
+                    this.notifyObservers();
                 }
             } catch (IOException e) {
                 e.printStackTrace();
diff --git a/racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java b/racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java
index 9d4a0bd8..f1e4d65b 100644
--- a/racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java
+++ b/racevisionGame/src/main/java/visualiser/gameController/Keys/SailsToggleKey.java
@@ -14,7 +14,7 @@ public class SailsToggleKey extends ControlKey {
      *
      */
     public SailsToggleKey(String name) {
-        super(name, BoatActionEnum.SAILS_IN);
+        super(name, BoatActionEnum.NOT_A_STATUS);
     }
 
     /**