diff --git a/racevisionGame/src/main/java/mock/model/MockBoat.java b/racevisionGame/src/main/java/mock/model/MockBoat.java
index 104fa264..a2f74dd7 100644
--- a/racevisionGame/src/main/java/mock/model/MockBoat.java
+++ b/racevisionGame/src/main/java/mock/model/MockBoat.java
@@ -25,7 +25,7 @@ public class MockBoat extends Boat {
     /**
      * Stores whether the boat is on autoVMG or not
      */
-    private boolean autoVMG = true;
+    private boolean autoVMG = false;
 
 
 
diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
index 150a1da8..8dcf1c48 100644
--- a/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
+++ b/racevisionGame/src/main/java/mock/model/commandFactory/TackGybeCommand.java
@@ -18,6 +18,9 @@ public class TackGybeCommand implements Command {
     //The refactoring of MockRace will require changes to be made
     @Override
     public void execute() {
+
+        boat.setAutoVMG(false);
+
         /*VMG newVMG = boat.getPolars().calculateVMG(
                 race.getWindDirection(),
                 race.getWindSpeed(),
diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
index 64cc6a9f..1a1eeda5 100644
--- a/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
+++ b/racevisionGame/src/main/java/mock/model/commandFactory/VMGCommand.java
@@ -18,6 +18,7 @@ public class VMGCommand implements Command {
     //The refactoring of MockRace will require changes to be made
     @Override
     public void execute() {
+        boat.setAutoVMG(true);
         /*VMG newVMG = boat.getPolars().calculateVMG(
                 race.getWindDirection(),
                 race.getWindSpeed(),
diff --git a/racevisionGame/src/main/java/mock/model/commandFactory/WindCommand.java b/racevisionGame/src/main/java/mock/model/commandFactory/WindCommand.java
index 5ba5d5bf..530bf5bc 100644
--- a/racevisionGame/src/main/java/mock/model/commandFactory/WindCommand.java
+++ b/racevisionGame/src/main/java/mock/model/commandFactory/WindCommand.java
@@ -20,13 +20,17 @@ public class WindCommand implements Command {
 
     @Override
     public void execute() {
+
+        boat.setAutoVMG(false);
+
         double wind = race.getWindDirection().degrees();
         double heading = boat.getBearing().degrees();
 
         double offset = 3.0;
 
         offset *= direction;
-        if(wind - heading < 0) offset *= -1;
+        double headWindDelta = wind - heading;
+        if ((headWindDelta < 0) || (headWindDelta > 180)) offset *= -1;
 
         boat.setBearing(Bearing.fromDegrees(heading + offset));
     }