diff --git a/ROSCO_toolbox/control_interface.py b/ROSCO_toolbox/control_interface.py
index b1770e32f..c2abd816a 100644
--- a/ROSCO_toolbox/control_interface.py
+++ b/ROSCO_toolbox/control_interface.py
@@ -59,6 +59,9 @@ def __init__(self, lib_name):
         # Define some avrSWAP parameters
         self.avrSWAP[2] = self.DT
         self.avrSWAP[60] = self.num_blade
+        self.avrSWAP[20] = 1 # HARD CODE initial rot speed = 1 rad/s
+        self.avrSWAP[26] = 10 # HARD CODE initial wind speed = 10 m/s
+
 
         # Code this as first casll
         self.avrSWAP[0] = 0
@@ -121,7 +124,10 @@ def call_controller(self,t,dt,pitch,torque,genspeed,rotspeed,ws):
         # Add states to avr
         self.avrSWAP[1] = t
         self.avrSWAP[2] = dt
-        self.avrSWAP[3] = self.pitch
+        self.avrSWAP[3] = pitch
+        self.avrSWAP[32] = pitch
+        self.avrSWAP[33] = pitch
+        self.avrSWAP[14] = genspeed*torque
         self.avrSWAP[22] = torque
         self.avrSWAP[19] = genspeed
         self.avrSWAP[20] = rotspeed