diff --git a/conf/messages.xml b/conf/messages.xml
index 460f013c2d..7ae25edd12 100644
--- a/conf/messages.xml
+++ b/conf/messages.xml
@@ -1089,6 +1089,8 @@
     <field name="phi"      type="int32"/>
     <field name="theta"    type="int32"/>
     <field name="psi"      type="int32"/>
+    <field name="carot_lon"  type="int32"/>
+    <field name="carot_lat"  type="int32"/>
   </message>
 
 
diff --git a/conf/settings/settings_booz2.xml b/conf/settings/settings_booz2.xml
index 1d67c16c88..cd37af7f32 100644
--- a/conf/settings/settings_booz2.xml
+++ b/conf/settings/settings_booz2.xml
@@ -39,6 +39,10 @@
       <dl_setting var="booz2_guidance_h_igain" min="-400" step="1" max="0" module="booz2_guidance_h" shortname="ki"/>
    </dl_settings>
 
+   <dl_settings NAME="NAV">
+     <dl_setting var="booz2_navigation_waypoint_idx" min="0" step="1" max="4" module="booz2_navigation" shortname="wp"  values="S1|S2|P1|P2|P3"  handler="SetWp"/>
+   </dl_settings>
+
     <dl_settings NAME="Filter">
        <dl_setting var="booz2_face_reinj_1" min="512" step="512" max="262144" module="booz2_filter_attitude_cmpl_euler" shortname="reinj_1"/>
     </dl_settings>