diff --git a/src/lab_sim/objectives/constrained_pick_and_place_subtree.xml b/src/lab_sim/objectives/constrained_pick_and_place_subtree.xml
index 5a437c3f..db7dfb6c 100644
--- a/src/lab_sim/objectives/constrained_pick_and_place_subtree.xml
+++ b/src/lab_sim/objectives/constrained_pick_and_place_subtree.xml
@@ -210,15 +210,31 @@
hand_frame_name="grasp_link"
force_threshold="100"
/>
-
+
+
+
+
+
-
+
+
@@ -24,10 +41,10 @@
wrench_gain="{wrench_gain}"
force_controlled_axes="1;1;1;0;0;0"
publish_rate="50"
- twist_stamped="{zero_twist}"
- wrench_stamped="{zero_wrench}"
velocity_controlled_axes="0;0;0;0;0;0"
velocity_force_controller_command_topic="/velocity_force_controller/command"
+ wrench="{wrench}"
+ twist="{twist}"
/>
@@ -39,9 +56,9 @@
force_controlled_axes="0;0;0;0;0;0"
publish_rate="50"
velocity_controlled_axes="1;1;1;0;0;0"
- wrench_stamped="{zero_wrench}"
- twist_stamped="{zero_twist}"
velocity_force_controller_command_topic="/velocity_force_controller/command"
+ wrench="{wrench}"
+ twist="{twist}"
/>
@@ -50,8 +67,8 @@
-
+
diff --git a/src/lab_sim/objectives/move_with_velocity_and_force.xml b/src/lab_sim/objectives/move_with_velocity_and_force.xml
index f991be67..49bc650e 100644
--- a/src/lab_sim/objectives/move_with_velocity_and_force.xml
+++ b/src/lab_sim/objectives/move_with_velocity_and_force.xml
@@ -1,6 +1,5 @@
-
-
+
+
+
+
+
-
+
+
diff --git a/src/lab_sim/objectives/pick_all_bottles_with_apriltags.xml b/src/lab_sim/objectives/pick_all_bottles_with_apriltags.xml
index 5a18620f..7ae7eb40 100644
--- a/src/lab_sim/objectives/pick_all_bottles_with_apriltags.xml
+++ b/src/lab_sim/objectives/pick_all_bottles_with_apriltags.xml
@@ -316,16 +316,32 @@
force_threshold="30"
wrench_topic_name="/force_torque_sensor_broadcaster/wrench"
/>
-
+
+
+
+
+
+
+
diff --git a/src/moveit_pro_kinova_configs/kinova_sim/objectives/velocity_force_controller_zero.xml b/src/moveit_pro_kinova_configs/kinova_sim/objectives/velocity_force_controller_zero.xml
index 7053616a..0031ebf0 100644
--- a/src/moveit_pro_kinova_configs/kinova_sim/objectives/velocity_force_controller_zero.xml
+++ b/src/moveit_pro_kinova_configs/kinova_sim/objectives/velocity_force_controller_zero.xml
@@ -13,6 +13,13 @@
angular_velocity_xyz="0.0;0.0;0.0"
linear_velocity_xyz="0.0;0.0;0.0"
/>
+
+
diff --git a/src/moveit_pro_kinova_configs/space_satellite_sim/objectives/grapple_moving_satellite_via_fiducial_tracking.xml b/src/moveit_pro_kinova_configs/space_satellite_sim/objectives/grapple_moving_satellite_via_fiducial_tracking.xml
index dbcbced1..161fe5a1 100644
--- a/src/moveit_pro_kinova_configs/space_satellite_sim/objectives/grapple_moving_satellite_via_fiducial_tracking.xml
+++ b/src/moveit_pro_kinova_configs/space_satellite_sim/objectives/grapple_moving_satellite_via_fiducial_tracking.xml
@@ -3,7 +3,6 @@
BTCPP_format="4"
main_tree_to_execute="Grapple Moving Satellite via Fiducial Tracking"
>
-
+
+
+
+
@@ -101,9 +138,9 @@
velocity_controlled_axes="1;1;1;1;1;1"
force_controlled_axes="0;0;0;0;0;0"
publish_rate="10"
- twist_stamped="{desired_twist}"
+ twist="{twist}"
velocity_force_controller_command_topic="/pose_jog/manipulator"
- wrench_stamped="{desired_wrench}"
+ wrench="{wrench}"
/>
@@ -114,13 +151,14 @@
planning_group_names="manipulator"
stop_safety_factor="1.200000"
include_octomap="false"
+ skip_collision_checks="false"
/>
@@ -145,6 +183,7 @@