diff --git a/conf/airframes/CDW/conf.xml b/conf/airframes/CDW/conf.xml
index 0f70df02064..85a8eff94a7 100644
--- a/conf/airframes/CDW/conf.xml
+++ b/conf/airframes/CDW/conf.xml
@@ -7,8 +7,8 @@
    telemetry="telemetry/default_rotorcraft.xml"
    flight_plan="flight_plans/rotorcraft_basic.xml"
    settings="settings/rotorcraft_basic.xml settings/control/stabilization_att_int.xml settings/modules/config_asctec_v2.xml"
-   gui_color="white"
    settings_modules="modules/imu_quality_assessment.xml modules/gps_ubx_ucenter.xml"
+   gui_color="white"
   />
   <aircraft
    name="Bebop"
@@ -27,8 +27,8 @@
    airframe="airframes/CDW/mavtec_cdw.xml"
    radio="radios/R6107SP_7ch.xml"
    telemetry="telemetry/default_rotorcraft.xml"
-   flight_plan="flight_plans/rotorcraft_survey.xml"
-   settings="settings/rotorcraft_basic.xml settings/control/stabilization_att_int.xml settings/modules/config_asctec_v2.xml settings/control/rotorcraft_guidance.xml"
+   flight_plan="flight_plans/Tudelft/rotorcraft_survey_competition.xml"
+   settings="settings/rotorcraft_basic.xml settings/control/stabilization_att_int.xml settings/modules/config_asctec_v2.xml settings/control/rotorcraft_guidance.xml settings/control/stabilization_rate.xml"
    settings_modules="modules/gps_ubx_ucenter.xml modules/nav_survey_rectangle_rotorcraft.xml modules/digital_cam.xml modules/geo_mag.xml"
    gui_color="blue"
   />
diff --git a/conf/airframes/CDW/mavtec_cdw.xml b/conf/airframes/CDW/mavtec_cdw.xml
index c05eef720ea..396a5d47f2a 100644
--- a/conf/airframes/CDW/mavtec_cdw.xml
+++ b/conf/airframes/CDW/mavtec_cdw.xml
@@ -47,6 +47,7 @@
       <define name="DC_SHUTTER_GPIO" value="GPIOC,GPIO12"/>
     </load>
     <load name="geo_mag.xml"/>
+    <load name="exception_flags.xml"/>
   </modules>
 
   <!-- ************************* ACTUATORS ************************* -->