diff --git a/conf/autopilot/subsystems/booz2_imu_crista.makefile b/conf/autopilot/subsystems/booz2_imu_crista.makefile
index 62cb80c18a..fb58d64329 100644
--- a/conf/autopilot/subsystems/booz2_imu_crista.makefile
+++ b/conf/autopilot/subsystems/booz2_imu_crista.makefile
@@ -53,9 +53,9 @@ ap.srcs += $(SRC_BOOZ)/booz_imu.c             \
            $(SRC_BOOZ)/imu/booz_imu_crista.c \
            $(SRC_BOOZ_ARCH)/imu/booz_imu_crista_arch.c
 
-ap.CFLAGS += -DUSE_I2C1  -DI2C1_SCLL=150 -DI2C1_SCLH=150 -DI2C1_VIC_SLOT=11 -DI2C1_BUF_LEN=16
 ap.CFLAGS += -DUSE_AMI601
 ap.srcs += $(SRC_BOOZ)/peripherals/booz_ami601.c
+ap.CFLAGS += -DUSE_I2C1  -DI2C1_SCLL=150 -DI2C1_SCLH=150 -DI2C1_VIC_SLOT=11 -DI2C1_BUF_LEN=16
 
 
 
diff --git a/sw/airborne/booz/arch/lpc21/imu/booz_imu_b2_arch.c b/sw/airborne/booz/arch/lpc21/imu/booz_imu_b2_arch.c
index c4fed8aad5..17f7cfcee2 100644
--- a/sw/airborne/booz/arch/lpc21/imu/booz_imu_b2_arch.c
+++ b/sw/airborne/booz/arch/lpc21/imu/booz_imu_b2_arch.c
@@ -91,7 +91,10 @@ void booz_imu_periodic(void) {
   // read adc
   booz_imu_ssp_status = BOOZ_IMU_SSP_STA_BUSY_MAX1168;
   booz_max1168_read();
-  
+#if defined IMU_B2_MAG_TYPE && IMU_B2_MAG_TYPE == IMU_B2_MAG_AMI601
+  RunOnceEvery(10, { ami601_read(); });
+#endif
+
 }
 
 
diff --git a/sw/simulator/nps_autopilot_booz.c b/sw/simulator/nps_autopilot_booz.c
new file mode 100644
index 0000000000..2910a5a18d
--- /dev/null
+++ b/sw/simulator/nps_autopilot_booz.c
@@ -0,0 +1,125 @@
+#include "nps_autopilot.h"
+
+#include "booz2_main.h"
+#include "nps_sensors.h"
+#include "nps_radio_control.h"
+#include "booz_radio_control.h"
+#include "booz_imu.h"
+#include "booz2_analog_baro.h"
+
+#include "actuators.h"
+
+#define BYPASS_AHRS
+
+struct NpsAutopilot autopilot;
+
+#ifdef BYPASS_AHRS
+static void sim_overwrite_ahrs(void);
+#endif
+
+
+void nps_autopilot_init(enum NpsRadioControlType type_rc, int num_rc_script, char* js_dev) {
+
+  nps_radio_control_init(type_rc, num_rc_script, js_dev);
+  
+  booz2_main_init();
+
+}
+
+#include <stdio.h>
+#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();
+  }
+
+  if (nps_sensors_gyro_available()) {
+    booz_imu_feed_gyro_accel();
+    booz2_main_event();
+  }
+
+  if (nps_sensors_mag_available()) {
+    booz_imu_feed_mag();
+    booz2_main_event();
+ }
+
+  if (nps_sensors_baro_available()) {
+    Booz2BaroISRHandler(sensors.baro.value);
+    booz2_main_event();
+  }
+#ifdef BYPASS_AHRS
+  sim_overwrite_ahrs();
+#endif /* BYPASS_AHRS */
+
+  if (nps_sensors_gps_available()) {
+    booz_gps_state.ecef_pos.x = sensors.gps.ecef_pos.x*100.;
+    booz_gps_state.ecef_pos.y = sensors.gps.ecef_pos.y*100.;
+    booz_gps_state.ecef_pos.z = sensors.gps.ecef_pos.z*100.;
+    booz_gps_state.ecef_vel.x = sensors.gps.ecef_vel.x*100.;
+    booz_gps_state.ecef_vel.y = sensors.gps.ecef_vel.y*100.;
+    booz_gps_state.ecef_vel.z = sensors.gps.ecef_vel.z*100.;
+    booz_gps_state.fix = BOOZ2_GPS_FIX_3D;
+    //    booz2_main_event();
+  }
+
+
+
+  booz2_main_periodic();
+
+  /* 25 */
+  if (time < 8) {
+    //    double hover = 0.25;
+    double hover = 0.2493;
+    //   double hover = 0.23;
+    //  double hover = 0.;
+    //  if (time > 20) hover = 0.25;
+    double yaw = 0.000000;
+    double pitch = 0.000;
+    double roll  = 0.0000;
+
+    autopilot.commands[SERVO_FRONT] = hover + yaw + pitch;
+    autopilot.commands[SERVO_BACK]  = hover + yaw - pitch;
+    autopilot.commands[SERVO_RIGHT] = hover - yaw - roll ;
+    autopilot.commands[SERVO_LEFT]  = hover - yaw + roll;
+  }
+  else {
+    int32_t ut_front = Actuator(SERVO_FRONT) - TRIM_FRONT;
+    int32_t ut_back  = Actuator(SERVO_BACK)  - TRIM_BACK;
+    int32_t ut_right = Actuator(SERVO_RIGHT) - TRIM_RIGHT;
+    int32_t ut_left  = Actuator(SERVO_LEFT)  - TRIM_LEFT;
+    autopilot.commands[SERVO_FRONT] = (double)ut_front / SUPERVISION_MAX_MOTOR;
+    autopilot.commands[SERVO_BACK]  = (double)ut_back  / SUPERVISION_MAX_MOTOR;
+    autopilot.commands[SERVO_RIGHT] = (double)ut_right / SUPERVISION_MAX_MOTOR;
+    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]);	 
+
+}
+
+#ifdef BYPASS_AHRS
+#include "nps_fdm.h"
+#include "math/pprz_algebra_int.h"
+#include "booz_ahrs.h"
+static void sim_overwrite_ahrs(void) {
+
+  //  printf("%f\n", fdm.ltpprz_to_body_eulers.phi);
+
+  booz_ahrs.ltp_to_body_euler.phi   = ANGLE_BFP_OF_REAL(fdm.ltpprz_to_body_eulers.phi);
+  booz_ahrs.ltp_to_body_euler.theta = ANGLE_BFP_OF_REAL(fdm.ltpprz_to_body_eulers.theta);
+  booz_ahrs.ltp_to_body_euler.psi   = ANGLE_BFP_OF_REAL(fdm.ltpprz_to_body_eulers.psi);
+
+  booz_ahrs.ltp_to_body_quat.qi = QUAT1_BFP_OF_REAL(fdm.ltpprz_to_body_quat.qi);
+  booz_ahrs.ltp_to_body_quat.qx = QUAT1_BFP_OF_REAL(fdm.ltpprz_to_body_quat.qx);
+  booz_ahrs.ltp_to_body_quat.qy = QUAT1_BFP_OF_REAL(fdm.ltpprz_to_body_quat.qy);
+  booz_ahrs.ltp_to_body_quat.qz = QUAT1_BFP_OF_REAL(fdm.ltpprz_to_body_quat.qz);
+
+  booz_ahrs.body_rate.p = RATE_BFP_OF_REAL(fdm.body_ecef_rotvel.p);
+  booz_ahrs.body_rate.q = RATE_BFP_OF_REAL(fdm.body_ecef_rotvel.q);
+  booz_ahrs.body_rate.r = RATE_BFP_OF_REAL(fdm.body_ecef_rotvel.r);
+
+}
+#endif /* BYPASS_AHRS */
+