diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java
index e87618c2..436da210 100644
--- a/src/main/java/seng302/controllers/RaceViewController.java
+++ b/src/main/java/seng302/controllers/RaceViewController.java
@@ -51,6 +51,8 @@ import java.util.stream.Collectors;
  */
 public class RaceViewController extends Thread implements ImportantAnnotationDelegate {
 
+    @FXML
+    private Text windSpeedText;
     @FXML
     private LineChart raceSparkLine;
     @FXML
@@ -335,6 +337,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel
     private void updateWindDirection() {
         windDirectionText.setText(String.format("%.1f°", ClientPacketParser.getWindDirection()));
         windArrowText.setRotate(ClientPacketParser.getWindDirection());
+        windSpeedText.setText(String.format("%.1f Knots", ClientPacketParser.getWindSpeed()));
     }
 
 
diff --git a/src/main/java/seng302/gameServer/GameState.java b/src/main/java/seng302/gameServer/GameState.java
index 43ea0018..90c649ca 100644
--- a/src/main/java/seng302/gameServer/GameState.java
+++ b/src/main/java/seng302/gameServer/GameState.java
@@ -25,7 +25,7 @@ public class GameState {
     
     public GameState(String hostIpAddress) {
         windDirection = 170d;
-        windSpeed = 1300d;
+        windSpeed = 10000d;
         yachts = new HashMap<>();
         players = new ArrayList<>();
 
diff --git a/src/main/java/seng302/server/messages/RaceStatusMessage.java b/src/main/java/seng302/server/messages/RaceStatusMessage.java
index 8d6183e8..0310216e 100644
--- a/src/main/java/seng302/server/messages/RaceStatusMessage.java
+++ b/src/main/java/seng302/server/messages/RaceStatusMessage.java
@@ -11,6 +11,7 @@ public class RaceStatusMessage extends Message{
     private final int MESSAGE_BASE_SIZE = 24;
     private final double windDirFactor = 0x4000 / 90;
 
+
     private long currentTime;
     private long raceId;
     private RaceStatus raceStatus;
diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml
index 9bb2926a..ea453f32 100644
--- a/src/main/resources/views/RaceView.fxml
+++ b/src/main/resources/views/RaceView.fxml
@@ -35,6 +35,11 @@
                         <Font name="System Bold" size="13.0" />
                     </font>
                 </Text>
+            <Text fx:id="windSpeedText" fill="#d3d3d3" layoutX="12.0" layoutY="213.0" strokeType="OUTSIDE" strokeWidth="0.0" text="0.0 Knot" textAlignment="RIGHT">
+               <font>
+                  <Font name="System Bold" size="13.0" />
+               </font>
+            </Text>
                 <CheckBox fx:id="toggleFps" focusTraversable="false" graphicTextGap="0.0" layoutX="21.0" layoutY="453.0" mnemonicParsing="false" prefHeight="18.0" prefWidth="143.0" selected="true" styleClass="ui-checkbox" text="Show FPS" textFill="WHITE" />
             <VBox fx:id="positionVbox" layoutX="12.0" layoutY="280.0" prefHeight="140.0" prefWidth="200.0" styleClass="text-white" />
             <Pane layoutX="11.0" layoutY="30.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="51.0" prefWidth="193.0">