diff --git a/controller/controller.ino b/controller/controller.ino
index f552febb40501fb5308e0d298a8de04417c949a1..2526df3f198528f2e2eefb546087ed5c6efd2cbe 100644
--- a/controller/controller.ino
+++ b/controller/controller.ino
@@ -266,6 +266,10 @@ void SerialPrint(String mode, int potent, int esc_val, unsigned int wing_angles[
   Serial.print(esc_val);
   Serial.print(",");
   Serial.print(freq);
+  for (int i = 0; i < sizeof(gCSN_PINS); i++) {
+    Serial.print(",");
+    Serial.print(wing_angles[i]);
+  }
   for (int i = 0; i < sizeof(gCSN_PINS); i++) {
     Serial.print(",");
     Serial.print(PosToDeg((wing_angles[i] - gMaxWingPos[i]) % ENC_PRECISION) + TRUE_MAX_ANGLE - 360);
diff --git a/controller/mechaRaptor.json b/controller/mechaRaptor.json
index 6493d72b31a62bffb0ea8023bd8dbe8a512a9acc..5458036f05a7113c1aa9e3aa3c8683bf2abab6d5 100644
--- a/controller/mechaRaptor.json
+++ b/controller/mechaRaptor.json
@@ -87,17 +87,79 @@
         {
             "datasets": [
                 {
-                    "alarm": 0,
+                    "alarm": 4095,
                     "fft": false,
                     "fftSamples": 1024,
                     "graph": false,
                     "led": false,
                     "log": false,
-                    "max": 0,
+                    "max": 4095,
                     "min": 0,
+                    "title": "1 - Left",
+                    "units": "-",
+                    "value": "%6",
+                    "widget": ""
+                },
+                {
+                    "alarm": 4095,
+                    "fft": false,
+                    "fftSamples": 1024,
+                    "graph": false,
+                    "led": false,
+                    "log": false,
+                    "max": 4095,
+                    "min": 0,
+                    "title": "1 - Right",
+                    "units": "-",
+                    "value": "%7",
+                    "widget": ""
+                },
+                {
+                    "alarm": 4095,
+                    "fft": false,
+                    "fftSamples": 1024,
+                    "graph": false,
+                    "led": false,
+                    "log": false,
+                    "max": 4095,
+                    "min": 0,
+                    "title": "2 - Left",
+                    "units": "-",
+                    "value": "%8",
+                    "widget": ""
+                },
+                {
+                    "alarm": 4095,
+                    "fft": false,
+                    "fftSamples": 1024,
+                    "graph": false,
+                    "led": false,
+                    "log": false,
+                    "max": 4095,
+                    "min": 0,
+                    "title": "2 - Right",
+                    "units": "-",
+                    "value": "%9",
+                    "widget": ""
+                }
+            ],
+            "title": "Wing Pos (raw)",
+            "widget": "multiplot"
+        },
+        {
+            "datasets": [
+                {
+                    "alarm": 0,
+                    "fft": false,
+                    "fftSamples": 1024,
+                    "graph": false,
+                    "led": false,
+                    "log": false,
+                    "max": 45,
+                    "min": -45,
                     "title": "Left",
                     "units": "°",
-                    "value": "%6",
+                    "value": "%10",
                     "widget": ""
                 },
                 {
@@ -107,11 +169,11 @@
                     "graph": false,
                     "led": false,
                     "log": false,
-                    "max": 0,
-                    "min": 0,
+                    "max": 45,
+                    "min": -45,
                     "title": "Right",
                     "units": "°",
-                    "value": "%7",
+                    "value": "%11",
                     "widget": ""
                 }
             ],
@@ -127,11 +189,11 @@
                     "graph": false,
                     "led": false,
                     "log": false,
-                    "max": 0,
-                    "min": 0,
+                    "max": 45,
+                    "min": -45,
                     "title": "Left",
                     "units": "°",
-                    "value": "%8",
+                    "value": "%12",
                     "widget": ""
                 },
                 {
@@ -141,11 +203,11 @@
                     "graph": false,
                     "led": false,
                     "log": false,
-                    "max": 0,
-                    "min": 0,
+                    "max": 45,
+                    "min": -45,
                     "title": "Right",
                     "units": "°",
-                    "value": "%9",
+                    "value": "%13",
                     "widget": ""
                 }
             ],
@@ -165,7 +227,7 @@
                     "min": 0,
                     "title": "1 - Tension",
                     "units": "V",
-                    "value": "%10",
+                    "value": "%14",
                     "widget": ""
                 },
                 {
@@ -179,7 +241,7 @@
                     "min": 0,
                     "title": "1 - Current",
                     "units": "A",
-                    "value": "%11",
+                    "value": "%15",
                     "widget": ""
                 },
                 {
@@ -193,7 +255,7 @@
                     "min": 0,
                     "title": "2 - Tension",
                     "units": "V",
-                    "value": "%12",
+                    "value": "%16",
                     "widget": ""
                 },
                 {
@@ -207,7 +269,7 @@
                     "min": 0,
                     "title": "2 - Current",
                     "units": "A",
-                    "value": "%13",
+                    "value": "%17",
                     "widget": ""
                 }
             ],