diff --git a/boards/px4/sitl/test.cmake b/boards/px4/sitl/test.cmake
index c228cba95c..757f1fd982 100644
--- a/boards/px4/sitl/test.cmake
+++ b/boards/px4/sitl/test.cmake
@@ -36,6 +36,7 @@ px4_add_board(
 		flight_mode_manager
 		fw_att_control
 		fw_pos_control_l1
+		fw_dyn_soar_control
 		gyro_calibration
 		gyro_fft
 		land_detector
diff --git a/src/modules/fw_dyn_soar_control/FixedwingPositionINDIControl.cpp b/src/modules/fw_dyn_soar_control/FixedwingPositionINDIControl.cpp
index e92f5dcf1d..0bb56f260e 100644
--- a/src/modules/fw_dyn_soar_control/FixedwingPositionINDIControl.cpp
+++ b/src/modules/fw_dyn_soar_control/FixedwingPositionINDIControl.cpp
@@ -242,20 +242,9 @@ FixedwingPositionINDIControl::vehicle_local_position_poll()
         _vel = Vector3f(pos.vx,pos.vy,pos.vz);
         _acc = Vector3f(pos.ax,pos.ay,pos.az);
     }
-    if(pos.timestamp_sample-hrt_absolute_time() > 50_ms){
-        PX4_ERR("local position sample is too old");
-    }
-}
-
-void
-FixedwingPositionINDIControl::Run()
-{
-    // only run controller if pos, vel, acc changed
-	vehicle_local_position_s pos;
-
-	if (_vehicle_local_position_sub.update(&pos))
-    {
-        PX4_INFO("running");
+    if(hrt_absolute_time()-pos.timestamp > 50_ms){
+        //PX4_ERR("local position sample is too old");
+        PX4_INFO("timestamps:\t%.1f\t%.1f",(double)hrt_absolute_time(),(double)pos.timestamp);
     }
 }
 
@@ -266,6 +255,59 @@ FixedwingPositionINDIControl::_set_wind_estimate(Vector3f wind)
     return;
 }
 
+void
+FixedwingPositionINDIControl::Run()
+{
+    // only run controller if pos, vel, acc changed
+	vehicle_local_position_s pos;
+
+    perf_begin(_loop_perf);
+
+	if (_vehicle_local_position_sub.update(&pos))
+    {   
+        // only update parameters if they changed
+		bool params_updated = _parameter_update_sub.updated();
+
+		// check for parameter updates
+		if (params_updated) {
+			// clear update
+			parameter_update_s pupdate;
+			_parameter_update_sub.copy(&pupdate);
+
+			// update parameters from storage
+			updateParams();
+			parameters_update();
+		}
+
+		//const float dt = math::constrain((pos.timestamp - _last_run) * 1e-6f, 0.002f, 0.04f);
+		_last_run = pos.timestamp;
+
+        // run polls
+        _set_wind_estimate(Vector3f(0.f,0.f,0.f));
+        //airspeed_poll();
+        //airflow_aoa_poll();
+        //airflow_slip_poll();
+
+        vehicle_local_position_poll();
+        //vehicle_attitude_poll();
+        //vehicle_angular_velocity_poll();
+        //vehicle_angular_acceleration_poll();
+
+        // compute control input
+        Vector3f ctrl = _compute_NDI_control_input(_pos,_vel,_acc,_att,_omega,_alpha);
+
+        // publish control input
+        //_angular_accel_sp = {}; 
+        _angular_accel_sp.timestamp = hrt_absolute_time();
+        _angular_accel_sp.xyz[0] = ctrl(0);
+        _angular_accel_sp.xyz[1] = ctrl(1);
+        _angular_accel_sp.xyz[2] = ctrl(2);
+        _alpha_sp_pub.publish(_angular_accel_sp);
+
+        //PX4_INFO("running");
+    }
+}
+
 Vector<float, FixedwingPositionINDIControl::_num_basis_funs>
 FixedwingPositionINDIControl::_get_basis_funs(float t)
 {
@@ -476,7 +518,7 @@ FixedwingPositionINDIControl::_get_attitude(Vector3f vel, Vector3f f)
     return q;
 }
 
-void
+Vector3f
 FixedwingPositionINDIControl::_compute_NDI_control_input(Vector3f pos, Vector3f vel, Vector3f acc, Quatf att, Vector3f omega, Vector3f alpha)
 {
     Dcmf R_ib(att);
@@ -510,14 +552,8 @@ FixedwingPositionINDIControl::_compute_NDI_control_input(Vector3f pos, Vector3f
     //Vector3f v_ref_norm = (v_ref-_wind_estimate).unit();
     // compute angular acceleration command (in body frame)
     Vector3f rot_acc_command = _K_q*w_err + _K_w*(omega_ref-omega) + alpha_ref;
-    // publish control input
-    _angular_accel_sp = {}; 
-    _angular_accel_sp.timestamp = hrt_absolute_time();
-    _angular_accel_sp.xyz[0] = rot_acc_command(0);
-    _angular_accel_sp.xyz[1] = rot_acc_command(1);
-    _angular_accel_sp.xyz[2] = rot_acc_command(2);
-    _alpha_sp_pub.publish(_angular_accel_sp);
-    return;
+    
+    return rot_acc_command;
 }
 
 int FixedwingPositionINDIControl::task_spawn(int argc, char *argv[])
@@ -550,7 +586,6 @@ FixedwingPositionINDIControl::init()
 		PX4_ERR("vehicle position callback registration failed!");
 		return false;
 	}
-
 	return true;
 }
 
diff --git a/src/modules/fw_dyn_soar_control/FixedwingPositionINDIControl.hpp b/src/modules/fw_dyn_soar_control/FixedwingPositionINDIControl.hpp
index 03c73e7241..79a6d54c6f 100644
--- a/src/modules/fw_dyn_soar_control/FixedwingPositionINDIControl.hpp
+++ b/src/modules/fw_dyn_soar_control/FixedwingPositionINDIControl.hpp
@@ -201,8 +201,8 @@ private:
 	Vector3f _get_angular_velocity_ref(float t=0, float T=1);	// get the reference angular velocity on the current path, at normalized time t in [0,1], with an intended cycle time of T
 	Vector3f _get_angular_acceleration_ref(float t=0, float T=1);	// get the reference angular acceleration on the current path, at normalized time t in [0,1], with an intended cycle time of T
 	Quatf _get_attitude(Vector3f vel, Vector3f f);	// get the attitude to produce force f while flying with velocity vel
-	void _compute_NDI_control_input(Vector3f pos, Vector3f vel, Vector3f acc, Quatf att, Vector3f omega, Vector3f alpha);
-	void _compute_INDI_control_input(Vector3f pos, Vector3f vel, Vector3f acc, Quatf att, Vector3f omega, Vector3f alpha);
+	Vector3f _compute_NDI_control_input(Vector3f pos, Vector3f vel, Vector3f acc, Quatf att, Vector3f omega, Vector3f alpha);
+	Vector3f _compute_INDI_control_input(Vector3f pos, Vector3f vel, Vector3f acc, Quatf att, Vector3f omega, Vector3f alpha);
 
 	// control variables
 	Vector<float, _num_basis_funs> _basis_coeffs_x;				// coefficients of the current path
@@ -221,6 +221,7 @@ private:
 	Quatf _att;			// attitude quaternion
 	Vector3f _omega;	// angular rate vector
 	Vector3f _alpha;	// angular acceleration vector
+	hrt_abstime _last_run{0};
 
 	// filter variables
 	std::array<Vector3f, 3> _f_list;