diff --git a/src/main/java/seng302/controllers/Controller.java b/src/main/java/seng302/controllers/Controller.java
index 7d45d39b..9d964243 100644
--- a/src/main/java/seng302/controllers/Controller.java
+++ b/src/main/java/seng302/controllers/Controller.java
@@ -89,6 +89,10 @@ public class Controller implements Initializable {
                 @Override
                 public void run() {
                     Platform.runLater(() -> {
+                        if (StreamParser.isRaceStarted()) {
+                            switchToRaceView();
+                            timer.cancel();
+                        }
                         if (StreamParser.isRaceFinished()) {
                             realTime.setText(StreamParser.getCurrentTimeString());
                             timeTillLive.setTextFill(Color.RED);
diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index 3b7ee6b5..12069084 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -309,7 +309,6 @@ public class RaceViewController extends Thread{
 //        }
 
         for (Yacht boat : StreamParser.getBoatsPos().values()) {
-            System.out.println(boat.getBoatStatus());
             if (boat.getBoatStatus() == 3) {  // 3 is finish status
                 positionVbox.getChildren().add(new Text(boat.getPosition() + ". " +
                         boat.getShortName() + " (Finished)"));