diff --git a/racevisionGame/src/main/java/mock/model/MockRace.java b/racevisionGame/src/main/java/mock/model/MockRace.java
index e69db01e..e574ae5a 100644
--- a/racevisionGame/src/main/java/mock/model/MockRace.java
+++ b/racevisionGame/src/main/java/mock/model/MockRace.java
@@ -356,11 +356,6 @@ public class MockRace extends RaceState {
 
             checkPosition(boat, totalElapsedMilliseconds);
 
-            if (boat.getCurrentSpeed() == 0) {
-                newOptimalVMG(boat);
-                boat.setBearing(boat.calculateBearingToNextMarker());
-            }
-
             setBoatSpeed(boat);
 
             //Calculates the distance travelled, in meters, in the current timeslice.
diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/SailsCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/SailsCommand.java
index bfb752ea..60ebb584 100644
--- a/racevisionGame/src/main/java/mock/model/commandFactory/SailsCommand.java
+++ b/racevisionGame/src/main/java/mock/model/commandFactory/SailsCommand.java
@@ -7,8 +7,9 @@ import java.util.Observable;
 
 public class SailsCommand extends ObserverCommand {
     private boolean sailsOut;
+    private double goalVelocity;
 
-    public SailsCommand(MockRace race, MockBoat boat, Boolean sailsOut) {
+    public SailsCommand(MockRace race, MockBoat boat, boolean sailsOut) {
         super(race, boat);
         this.sailsOut = sailsOut;
     }
@@ -16,6 +17,7 @@ public class SailsCommand extends ObserverCommand {
     @Override
     public void execute() {
         this.boat.setSailsOut(this.sailsOut);
+
     }
 
     @Override