diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index c2153c1f..774ec780 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -322,6 +322,21 @@ public class RaceViewController extends Controller {
             };
             trackBoat.start();
 
+            if (boat.isClientBoat()) {
+                BoatHighlight boatHighlight = new BoatHighlight(10, new Color(1, 1, 0, 0.1));
+                viewSubjects.add(boatHighlight);
+                boatModel.getMesh().toFront();
+                AnimationTimer highlightTrack = new AnimationTimer() {
+                    @Override
+                    public void handle(long now) {
+                        boatHighlight.setX(boatModel.getPosition().getX());
+                        boatHighlight.setY(boatModel.getPosition().getY());
+                        boatHighlight.setZ(boatModel.getPosition().getZ());
+                    }
+                };
+                highlightTrack.start();
+            }
+
             Material markColor = new PhongMaterial(new Color(0.15,0.9,0.2,1));
             CompoundMark nextMark = boat.getCurrentLeg().getEndCompoundMark();
             view3D.getShape(nextMark.getMark1().getSourceID()).getMesh().setMaterial(markColor);