diff --git a/config/chomp_planning.yaml b/config/chomp_planning.yaml
index c14a673e85a300e2ac5c4c7bc6d8ab389c19d440..eb9c91225b1db9db1f5b5f7e1d8ff51191a311e8 100644
--- a/config/chomp_planning.yaml
+++ b/config/chomp_planning.yaml
@@ -7,12 +7,12 @@ learning_rate: 0.01
 smoothness_cost_velocity: 0.0
 smoothness_cost_acceleration: 1.0
 smoothness_cost_jerk: 0.0
-ridge_factor: 0.01
+ridge_factor: 0.0
 use_pseudo_inverse: false
 pseudo_inverse_ridge_factor: 1e-4
 joint_update_limit: 0.1
 collision_clearance: 0.2
 collision_threshold: 0.07
 use_stochastic_descent: true
-enable_failure_recovery: true
-max_recovery_attempts: 5
\ No newline at end of file
+enable_failure_recovery: false
+max_recovery_attempts: 5
diff --git a/launch/demo_chomp.launch b/launch/demo_chomp.launch
new file mode 100644
index 0000000000000000000000000000000000000000..a3051a809fd8e46744ee7f9ae765f7d4fa682e97
--- /dev/null
+++ b/launch/demo_chomp.launch
@@ -0,0 +1,5 @@
+<launch>
+  <include file="$(dirname)/demo.launch">
+    <arg name="pipeline" value="chomp"/>
+  </include>
+</launch>
diff --git a/launch/ompl-chomp_planning_pipeline.launch.xml b/launch/ompl-chomp_planning_pipeline.launch.xml
new file mode 100644
index 0000000000000000000000000000000000000000..178d2bef7acc8ffdaa0de8317d567c1ab9b79be3
--- /dev/null
+++ b/launch/ompl-chomp_planning_pipeline.launch.xml
@@ -0,0 +1,19 @@
+<launch>
+  <!-- load OMPL planning pipeline, but add the CHOMP planning adapter. -->
+  <include file="$(find panda_moveit_config)/launch/ompl_planning_pipeline.launch.xml">
+    <arg name="planning_adapters" value="
+       default_planner_request_adapters/AddTimeParameterization
+       default_planner_request_adapters/FixWorkspaceBounds
+       default_planner_request_adapters/FixStartStateBounds
+       default_planner_request_adapters/FixStartStateCollision
+       default_planner_request_adapters/FixStartStatePathConstraints
+       chomp/OptimizerAdapter"
+       />
+  </include>
+
+  <!-- load chomp config -->
+  <rosparam command="load" file="$(find panda_moveit_config)/config/chomp_planning.yaml"/>
+
+  <!-- override trajectory_initialization_method -->
+  <param name="trajectory_initialization_method" value="fillTrajectory"/>
+</launch>