diff --git a/launch/demo/demo_turtlebot_mapping.launch b/launch/demo/demo_turtlebot_mapping.launch
index 6d74e8be..26fd5f80 100644
--- a/launch/demo/demo_turtlebot_mapping.launch
+++ b/launch/demo/demo_turtlebot_mapping.launch
@@ -56,16 +56,17 @@
     <node name="rtabmap" pkg="rtabmap_ros" type="rtabmap" output="screen" args="$(arg args)">
 	  <param name="database_path"       type="string" value="$(arg database_path)"/>
 	  <param name="frame_id"            type="string" value="base_footprint"/>
-	  <param name="odom_frame_id"       type="string" value="odom"/>
 	  <param name="wait_for_transform_duration"  type="double"   value="$(arg wait_for_transform)"/>
 	  <param name="subscribe_depth"     type="bool"   value="true"/>
 	  <param name="subscribe_scan"      type="bool"   value="true"/>
+	  <param name="map_negative_poses_ignored" type="bool" value="true"/>
 	
 	  <!-- inputs -->
 	  <remap from="scan"            to="/scan"/>
 	  <remap from="rgb/image"       to="$(arg rgb_topic)"/>
   	  <remap from="depth/image"     to="$(arg depth_topic)"/>
   	  <remap from="rgb/camera_info" to="$(arg camera_info_topic)"/>
+	  <remap unless="$(arg rgbd_odometry)" from="odom" to="/odom"/>
   	  
   	  <!-- output -->
   	  <remap from="grid_map" to="/map"/>
@@ -84,7 +85,8 @@
 	  <param name="Rtabmap/TimeThr"              type="string" value="700"/>
 	  <param name="Mem/RehearsalSimilarity"      type="string" value="0.30"/>
 	  <param name="Optimizer/Slam2D"             type="string" value="true"/>
-	  <param name="Reg/Force3DoF"                type="string" value="true"/>   
+	  <param name="Reg/Force3DoF"                type="string" value="true"/>
+	  <param name="GridGlobal/MinSize"           type="string" value="20"/>
 	  
 	  <!-- localization mode -->
 	  <param     if="$(arg localization)" name="Mem/IncrementalMemory" type="string" value="false"/>