diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index c14cc0c0..120fb170 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -322,8 +322,8 @@ public class GameState implements Runnable {
             checkPowerUpTimeout(yacht);
             yacht.runAutoPilot();
             yacht.updateLocation(timeInterval);
+            checkCollision(yacht);
             if (yacht.getBoatStatus() != BoatStatus.FINISHED) {
-                checkCollision(yacht);
                 checkForLegProgression(yacht);
                 raceFinished = false;
             }
diff --git a/src/main/java/seng302/gameServer/MainServerThread.java b/src/main/java/seng302/gameServer/MainServerThread.java
index 3c305f90..0b7e6433 100644
--- a/src/main/java/seng302/gameServer/MainServerThread.java
+++ b/src/main/java/seng302/gameServer/MainServerThread.java
@@ -191,7 +191,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
                 GameState.spawnNewToken();
                 broadcastMessage(MessageFactory.getRaceXML());
             }
-        }, 0, 60000);
+        }, 10000, 60000);
     }
 
     /**