diff --git a/conf/airframes/funjet1.xml b/conf/airframes/funjet1.xml
index 7cb963ab64..c195e52073 100644
--- a/conf/airframes/funjet1.xml
+++ b/conf/airframes/funjet1.xml
@@ -106,8 +106,8 @@
     <define name="CARROT" value="5." unit="s"/>
     <define name="KILL_MODE_DISTANCE" value="(1.5*MAX_DIST_FROM_HOME)"/>
     <define name="CONTROL_RATE" value="60" unit="Hz"/>
-<!--    <define name="XBEE_INIT" value="\"ATPL2\rATRN1\rATTT80\r\""/> -->
-<!--    <define name="NO_XBEE_API_INIT" value="TRUE"/> -->
+    <define name="XBEE_INIT" value="\"ATPL2\rATRN1\rATTT80\r\""/>
+<!--    <define name="NO_XBEE_API_INIT" value="TRUE"/>-->
     <define name="ALT_KALMAN_ENABLED" value="TRUE"/>
 
     <define name="TRIGGER_DELAY" value="1."/>
@@ -168,8 +168,8 @@
   <section name="AGGRESSIVE" prefix="AGR_">
     <define name="BLEND_START" value="20"/><!-- Altitude Error to Initiate Aggressive Climb CANNOT BE ZERO!!-->
     <define name="BLEND_END" value="10"/><!-- Altitude Error to Blend Aggressive to Regular Climb Modes  CANNOT BE ZERO!!-->
-    <define name="CLIMB_THROTTLE" value="0.7"/><!-- Gaz for Aggressive Climb -->
-    <define name="CLIMB_PITCH" value="0.25"/><!-- Pitch for Aggressive Climb -->
+    <define name="CLIMB_THROTTLE" value="0.6"/><!-- Gaz for Aggressive Climb -->
+    <define name="CLIMB_PITCH" value="0.20"/><!-- Pitch for Aggressive Climb -->
     <define name="DESCENT_THROTTLE" value="0.1"/><!-- Gaz for Aggressive Decent -->
     <define name="DESCENT_PITCH" value="-0.15"/><!-- Pitch for Aggressive Decent -->
     <define name="CLIMB_NAV_RATIO" value="0.8"/><!-- Percent Navigation for Altitude Error Equal to Start Altitude -->
@@ -194,12 +194,12 @@
 	<define name="HOME_RADIUS" value="100" unit="m"/>
 </section>
  
-<!--
+<!-- -->
  <section name="DATALINK" prefix="DATALINK_">
     <define name="DEVICE_TYPE" value="XBEE"/>
     <define name="DEVICE_ADDRESS" value="...."/>
   </section>
--->
+<!-- -->
 
   <section name="Digital camera telecommand">
     <!-- IOs are seen as LEDs -->
@@ -233,12 +233,12 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c  
 
-#XBEE ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B9600
-#XBEE ap.srcs += downlink.c $(SRC_ARCH)/uart_hw.c datalink.c xbee.c
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B9600
+ap.srcs += downlink.c $(SRC_ARCH)/uart_hw.c datalink.c xbee.c
 
 #TRANSPARENT
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
-ap.srcs += downlink.c $(SRC_ARCH)/uart_hw.c datalink.c pprz_transport.c
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.srcs += downlink.c $(SRC_ARCH)/uart_hw.c datalink.c pprz_transport.c
 
 
 ap.CFLAGS += -DINTER_MCU
diff --git a/conf/flight_plans/NS.xml b/conf/flight_plans/NS.xml
new file mode 100644
index 0000000000..d5192ba7ba
--- /dev/null
+++ b/conf/flight_plans/NS.xml
@@ -0,0 +1,66 @@
+<!DOCTYPE flight_plan SYSTEM "flight_plan.dtd">
+
+<flight_plan alt="1900" ground_alt="1780" lat0="42.725089" lon0="1.688210" max_dist_from_home="20000" name="NS" security_height="25">
+  <header>
+#include "nav_line.h"
+#include "datalink.h"
+</header>
+  <waypoints>
+    <waypoint name="HOME" x="0" y="0"/>
+    <waypoint name="BEILLE" x="0" y="-10"/>
+    <waypoint name="STDBY" x="49.5" y="100.1"/>
+    <waypoint alt="2350.0" name="PASS" x="1184.2" y="-11752.8"/>
+    <waypoint alt="2000.0" name="INCLES" x="-289.6" y="-13601.6"/>
+    <waypoint alt="1880.0" name="AF" x="-199.2" y="-13625.7"/>
+    <waypoint alt="1850.0" name="TD" x="-290.0" y="-13621.7"/>
+    <waypoint name="_BASELEG" x="1742.7" y="-13383.7"/>
+    <waypoint name="CLIMB" x="-114.5" y="162.3"/>
+    <waypoint alt="2100.0" name="LAPARAN" x="1530.1" y="-6079.1"/>
+    <waypoint alt="2150.0" name="DESCENT" x="352.6" y="-12433.6"/>
+  </waypoints>
+  <exceptions/>
+  <blocks>
+    <block name="Holding point">
+      <set value="1" var="kill_throttle"/>
+      <attitude roll="0" throttle="0" vmode="throttle"/>
+    </block>
+    <block key="t" name="Takeoff" strip_button="Takeoff (wp CLIMB)" strip_icon="takeoff.png">
+      <exception cond="estimator_z > ground_alt+25" deroute="Standby"/>
+      <set value="0" var="kill_throttle"/>
+      <set value="0" var="estimator_flight_time"/>
+      <go from="HOME" pitch="15" throttle="1.0" vmode="throttle" wp="CLIMB"/>
+    </block>
+    <block key="<Control>a" name="Standby" strip_button="Standby" strip_icon="home.png">
+      <set value="NAV_MODE_COURSE" var="nav_mode"/>
+      <circle radius="nav_radius" wp="STDBY"/>
+    </block>
+    <block name="GO">
+      <go from="BEILLE" hmode="route" wp="LAPARAN"/>
+      <go from="LAPARAN" hmode="route" wp="PASS"/>
+      <go from="PASS" hmode="route" wp="DESCENT"/>
+      <go alt="2100" from="DESCENT" hmode="route" wp="INCLES"/>
+      <circle radius="100" wp="INCLES"/>
+    </block>
+    <block name="Land Right AF-TD" strip_button="Land right (wp AF-TD)" strip_icon="land-right.png">
+      <set value="DEFAULT_CIRCLE_RADIUS" var="nav_radius"/>
+      <deroute block="land"/>
+    </block>
+    <block name="Land Left AF-TD" strip_button="Land left (wp AF-TD)" strip_icon="land-left.png">
+      <set value="-DEFAULT_CIRCLE_RADIUS" var="nav_radius"/>
+      <deroute block="land"/>
+    </block>
+    <block name="land">
+      <call fun="nav_compute_baseleg(WP_AF, WP_TD, WP__BASELEG, nav_radius)"/>
+      <circle radius="nav_radius" until="NavCircleCount() > 0.5" wp="_BASELEG"/>
+      <circle radius="nav_radius" until="And(NavQdrCloseTo(DegOfRad(baseleg_out_qdr)-10), 10 > fabs(estimator_z - WaypointAlt(WP__BASELEG)))" wp="_BASELEG"/>
+    </block>
+    <block name="final">
+      <exception cond="ground_alt + 10 > estimator_z" deroute="flare"/>
+      <go from="AF" hmode="route" vmode="glide" wp="TD"/>
+    </block>
+    <block name="flare">
+      <go approaching_time="0" from="AF" hmode="route" throttle="0.0" vmode="throttle" wp="TD"/>
+      <attitude roll="0.0" throttle="0.0" until="FALSE" vmode="throttle"/>
+    </block>
+  </blocks>
+</flight_plan>
diff --git a/conf/settings/tuning.xml b/conf/settings/tuning.xml
index 3d5b8469b1..957fefbfca 100644
--- a/conf/settings/tuning.xml
+++ b/conf/settings/tuning.xml
@@ -93,6 +93,7 @@
         <dl_setting MAX="1" MIN="0.02" STEP="0.01" VAR="h_ctl_roll_slew" shortname="roll slew"/>
         <dl_setting MAX="500" MIN="-500" STEP="5" VAR="nav_radius"/>
         <dl_setting MAX="359" MIN="0" STEP="5" VAR="nav_course"/>
+        <dl_setting MAX="2" MIN="1" STEP="1" VAR="nav_mode"/>
         <dl_setting MAX="5" MIN="-5" STEP="0.5" VAR="nav_climb"/>
         <dl_setting MAX="15" MIN="-15" STEP="1" VAR="fp_pitch"/>
         <dl_setting MAX="50" MIN="-50" STEP="5" VAR="nav_shift" module="nav" handler="IncreaseShift" shortname="inc. shift">