diff --git a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
index e0538b39..fadef653 100644
--- a/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
+++ b/racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
@@ -328,32 +328,30 @@ public class ResizableRaceCanvas extends ResizableCanvas {
         double sailRotateAngle; // required rotation for correct sail display
         Image sailImage;
 
-        gc.save();
-        // right half of points of sail
-        if (boatBearing < 180) {
-            sailImage = sailsRight;
-            sailRotateAngle = boatBearing;    // math
-            xPos -= 1;  // right align to boat edge on canvas
-//            System.out.println("right side -- boat: " + boatBearing +
-//                    "|| rotate: " + sailRotateAngle);
-        }
-        // left half of points of sail
-        else {
-            sailImage = sailsLeft;
-            sailRotateAngle = -(360 - boatBearing);   // math
-            xPos -= 5;  // left align to boat edge on canvas
-//            System.out.println("left side -- boat: " + boatBearing +
-//                    "|| rotate: " + sailRotateAngle);
-        }
+        // remove when method is finished
+        sailRotateAngle = 0;
+        sailImage = null;
 
-        // Change the angle of the sail if the sail is out
+        gc.save();
         if (ThisBoat.getInstance().isSailsOut()) {
-            if (boatBearing < 180) {
-                sailRotateAngle -= 90;
-            } else {
-                sailRotateAngle += 90;
+            if (boatBearing < 180) {    // right half of points of sail
+                sailImage = sailsRight;
+                sailRotateAngle = boatBearing * 0.5;    // math
+                xPos -= 1;  // right align to boat edge on canvas
+                //            System.out.println("right side -- boat: " + boatBearing +
+                //                    "|| rotate: " + sailRotateAngle);
+            }
+            else {  // left half of points of sail
+                sailImage = sailsLeft;
+                sailRotateAngle = -(360 - boatBearing) * 0.5;   // math
+                xPos -= 5;  // left align to boat edge on canvas
+                //            System.out.println("left side -- boat: " + boatBearing +
+                //                    "|| rotate: " + sailRotateAngle);
             }
         }
+        else {
+//            TODO: display luffing sail
+        }
 
         // rotate sails based on boats current heading
         rotate(sailRotateAngle, boatPos.getX(), boatPos.getY());