diff --git a/src/hooks/module/useTrestle.js b/src/hooks/module/useTrestle.js
index 17f6711a..29f2d664 100644
--- a/src/hooks/module/useTrestle.js
+++ b/src/hooks/module/useTrestle.js
@@ -807,59 +807,57 @@ export const useTrestle = () => {
   const getAzimuth = (parent) => {
     const { moduleCompass, surfaceCompass, direction } = parent
 
+    if(surfaceCompass) {
+      return -surfaceCompass
+    }
+
     let resultAzimuth = surfaceCompass || moduleCompass
 
 
+
+
     switch (direction) {
       case 'south': {
-        if (resultAzimuth < 0) {
-          return -1 * resultAzimuth
-        } else if (resultAzimuth === 0) {
-          return 0
-        } else if (resultAzimuth < 180) {
-          return -1 * resultAzimuth
-        } else if (resultAzimuth === 180) {
-          return 180
-        }
+        return resultAzimuth
       }
       case 'north': {
         if (resultAzimuth < 0) {
-          return -1 * (180 + resultAzimuth)
+          return 180 + resultAzimuth
         } else if (resultAzimuth === 0) {
           return 180
         } else if (resultAzimuth < 180) {
-          return 180 - resultAzimuth
+          return resultAzimuth - 180
         } else if (resultAzimuth === 180) {
           return 0
         }
       }
       case 'west': {
         if (resultAzimuth > -180 && resultAzimuth < 0) {
-          return -1 * (90 + resultAzimuth)
+          return 90 + resultAzimuth
         } else if (resultAzimuth === 0) {
-          return -180 + (90 - resultAzimuth)
+          return 90 - resultAzimuth
         } else if (resultAzimuth < 180) {
           if (resultAzimuth > 90) {
-            return 180 + (90 - resultAzimuth)
+            return -180 + (resultAzimuth - 90)
           }
-          return -180 + (90 - resultAzimuth)
-        } else if (resultAzimuth === 180) {
           return 180 + (90 - resultAzimuth)
+        } else if (resultAzimuth === 180) {
+          return -180 + (resultAzimuth - 90)
         }
       }
 
       case 'east': {
         if (resultAzimuth === 0) {
-          return 90 - resultAzimuth
+          return -180 + (90 - resultAzimuth)
         } else if (resultAzimuth > 0 && resultAzimuth < 180) {
-          return 90 - resultAzimuth
+          return resultAzimuth - 90
         } else if (resultAzimuth === 180) {
-          return 90 - resultAzimuth
+          return resultAzimuth - 90
         } else if (resultAzimuth > -180 && resultAzimuth < 0) {
-          if (resultAzimuth < -90) {
-            return -180 - (90 + resultAzimuth)
+          if (resultAzimuth <= -90) {
+            return 180 + (90 + resultAzimuth)
           }
-          return 180 - (90 + resultAzimuth)
+          return -180 + (90 + resultAzimuth)
         }
       }
     }