diff --git a/src/main/java/seng302/Networking/Utils/BoatLocationMessage.java b/src/main/java/seng302/Networking/Utils/BoatLocationMessage.java
index 9380a0aa..9c01060c 100644
--- a/src/main/java/seng302/Networking/Utils/BoatLocationMessage.java
+++ b/src/main/java/seng302/Networking/Utils/BoatLocationMessage.java
@@ -108,9 +108,9 @@ public class BoatLocationMessage extends AC35Data
      * @param currentSet
      * @param rudderAngle
      */
-    public BoatLocationMessage(byte messageVersionNumber, long time, int sourceID, int sequenceNumber, byte deviceType, int latitude, int longitude, int altitude, int heading, short pitch, short roll, int boatSpeed, int boatCOG, int boatSOG, int apparentWindSpeed, short apparentWindAngle, int trueWindSpeed, short trueWindDirection, short trueWindAngle, int currentDrift, int currentSet, short rudderAngle, MessageType type)
+    public BoatLocationMessage(byte messageVersionNumber, long time, int sourceID, int sequenceNumber, byte deviceType, int latitude, int longitude, int altitude, int heading, short pitch, short roll, int boatSpeed, int boatCOG, int boatSOG, int apparentWindSpeed, short apparentWindAngle, int trueWindSpeed, short trueWindDirection, short trueWindAngle, int currentDrift, int currentSet, short rudderAngle)
     {
-        super(type);
+        super(MessageType.BOATLOCATION);
         this.messageVersionNumber = messageVersionNumber;
         this.time = time;
         this.sourceID = sourceID;
diff --git a/src/main/java/seng302/Networking/Utils/BoatStatus.java b/src/main/java/seng302/Networking/Utils/BoatStatus.java
index e0b6d75f..62c6cf0f 100644
--- a/src/main/java/seng302/Networking/Utils/BoatStatus.java
+++ b/src/main/java/seng302/Networking/Utils/BoatStatus.java
@@ -3,7 +3,7 @@ package seng302.Networking.Utils;
 /**
  * Created by hba56 on 23/04/17.
  */
-public class BoatStatus extends AC35Data{
+public class BoatStatus{
     private int sourceID;
     private byte boatStatus;
     private byte legNumber;
@@ -12,8 +12,7 @@ public class BoatStatus extends AC35Data{
     private long estTimeAtNextMark;
     private long estTimeAtFinish;
 
-    public BoatStatus(int sourceID, byte boatStatus, byte legNumber, byte numPenaltiesAwarded, byte numPenaltiesServed, long estTimeAtNextMark, long estTimeAtFinish, MessageType type) {
-        super(type);
+    public BoatStatus(int sourceID, byte boatStatus, byte legNumber, byte numPenaltiesAwarded, byte numPenaltiesServed, long estTimeAtNextMark, long estTimeAtFinish) {
         this.sourceID = sourceID;
         this.boatStatus = boatStatus;
         this.legNumber = legNumber;
diff --git a/src/main/java/seng302/Networking/Utils/CourseWind.java b/src/main/java/seng302/Networking/Utils/CourseWind.java
index a077fb87..aa50c89a 100644
--- a/src/main/java/seng302/Networking/Utils/CourseWind.java
+++ b/src/main/java/seng302/Networking/Utils/CourseWind.java
@@ -9,8 +9,8 @@ public class CourseWind extends AC35Data{
     private long time;
 
     public CourseWind(int ID, long time, int raceID, int windDirection, int windSpeed, int bestUpwindAngle, int bestDownwindAngle,
-                      int flags, MessageType type){
-        super(type);
+                      int flags){
+        super(MessageType.COURSEWIND);
         this.ID = ID;
         this.time = time;
         this.raceID = raceID;
diff --git a/src/main/java/seng302/Networking/Utils/RaceMessage.java b/src/main/java/seng302/Networking/Utils/RaceMessage.java
index 8df056d3..b063c9d4 100644
--- a/src/main/java/seng302/Networking/Utils/RaceMessage.java
+++ b/src/main/java/seng302/Networking/Utils/RaceMessage.java
@@ -8,8 +8,8 @@ public class RaceMessage extends AC35Data {
     private int lineNumber;
     private String messageText;
 
-    public RaceMessage(int lineNumber, String messageText, MessageType type){
-        super(type);
+    public RaceMessage(int lineNumber, String messageText){
+        super(MessageType.DISPLAYTEXTMESSAGE);
         this.lineNumber = lineNumber;
         this.messageText = messageText;
     }