diff --git a/conf/settings/settings_booz2_sim.xml b/conf/settings/settings_booz2_sim.xml
new file mode 100644
index 0000000000..4c49b24815
--- /dev/null
+++ b/conf/settings/settings_booz2_sim.xml
@@ -0,0 +1,11 @@
+<!DOCTYPE settings SYSTEM "settings.dtd">
+
+<settings>
+  <dl_settings>
+
+    <dl_settings NAME="Sim">
+       <dl_setting var="nps_bypass_ahrs" min="0" step="1" max="1" module="nps/nps_autopilot_booz" shortname="bypass_ahrs" values="No|Yes"/>
+    </dl_settings>
+
+  </dl_settings>
+</settings>
diff --git a/sw/simulator/nps/nps_autopilot_booz.c b/sw/simulator/nps/nps_autopilot_booz.c
index 58bf167deb..b1b02f6c0e 100644
--- a/sw/simulator/nps/nps_autopilot_booz.c
+++ b/sw/simulator/nps/nps_autopilot_booz.c
@@ -1,4 +1,4 @@
-#include "nps_autopilot.h"
+#include "nps_autopilot_booz.h"
 
 #include "booz2_main.h"
 #include "nps_sensors.h"
@@ -9,19 +9,18 @@
 
 #include "actuators.h"
 
-#define BYPASS_AHRS
 
 struct NpsAutopilot autopilot;
+bool_t nps_bypass_ahrs;
 
-#ifdef BYPASS_AHRS
 static void sim_overwrite_ahrs(void);
-#endif
 
 
 void nps_autopilot_init(enum NpsRadioControlType type_rc, int num_rc_script, char* rc_dev) {
 
   nps_radio_control_init(type_rc, num_rc_script, rc_dev);
-  
+  nps_bypass_ahrs = TRUE;
+
   booz2_main_init();
 
 }
@@ -30,7 +29,7 @@ void nps_autopilot_init(enum NpsRadioControlType type_rc, int num_rc_script, cha
 #include "booz2_gps.h"
 
 void nps_autopilot_run_step(double time __attribute__ ((unused))) {
-  
+
   if (nps_radio_control_available(time)) {
     booz_radio_control_feed();
     booz2_main_event();
@@ -50,9 +49,11 @@ void nps_autopilot_run_step(double time __attribute__ ((unused))) {
     Booz2BaroISRHandler(sensors.baro.value);
     booz2_main_event();
   }
-#ifdef BYPASS_AHRS
-  sim_overwrite_ahrs();
-#endif /* BYPASS_AHRS */
+
+  if (nps_bypass_ahrs) {
+    sim_overwrite_ahrs();
+  }
+
 
   if (nps_sensors_gps_available()) {
     booz_gps_feed_value();
@@ -88,11 +89,10 @@ void nps_autopilot_run_step(double time __attribute__ ((unused))) {
     autopilot.commands[SERVO_LEFT]  = (double)ut_left  / SUPERVISION_MAX_MOTOR;
   }
   //  printf("%f %f %f %f\n", autopilot.commands[SERVO_FRONT], autopilot.commands[SERVO_BACK],
-  //	 autopilot.commands[SERVO_RIGHT], autopilot.commands[SERVO_LEFT]);	 
+  //	 autopilot.commands[SERVO_RIGHT], autopilot.commands[SERVO_LEFT]);
 
 }
 
-#ifdef BYPASS_AHRS
 #include "nps_fdm.h"
 #include "math/pprz_algebra_int.h"
 #include "booz_ahrs.h"
@@ -117,5 +117,4 @@ static void sim_overwrite_ahrs(void) {
   booz_ahrs.body_rate.r = RATE_BFP_OF_REAL(fdm.body_ecef_rotvel.r);
 
 }
-#endif /* BYPASS_AHRS */
 
diff --git a/sw/simulator/nps/nps_autopilot_booz.h b/sw/simulator/nps/nps_autopilot_booz.h
new file mode 100644
index 0000000000..c412efa324
--- /dev/null
+++ b/sw/simulator/nps/nps_autopilot_booz.h
@@ -0,0 +1,9 @@
+#ifndef NPS_AUTOPILOT_BOOZ_H
+#define NPS_AUTOPILOT_BOOZ_H
+
+#include "nps_autopilot.h"
+
+
+extern bool_t nps_bypass_ahrs;
+
+#endif /* NPS_AUTOPILOT_BOOZ_H */