diff --git a/y2016/control_loops/python/arm.py b/y2016/control_loops/python/arm.py
index 4d5bbb9..8908038 100755
--- a/y2016/control_loops/python/arm.py
+++ b/y2016/control_loops/python/arm.py
@@ -379,8 +379,8 @@
 
   scenario_plotter = ScenarioPlotter()
 
-  J_accelerating = 15
-  J_decelerating = 5
+  J_accelerating = 18
+  J_decelerating = 7
 
   arm = Arm(name='AcceleratingArm', J=J_accelerating)
   arm_integral_controller = IntegralArm(
diff --git a/y2016/control_loops/python/shoulder.py b/y2016/control_loops/python/shoulder.py
index 6beac61..6c07725 100755
--- a/y2016/control_loops/python/shoulder.py
+++ b/y2016/control_loops/python/shoulder.py
@@ -71,7 +71,7 @@
     controllability = controls.ctrb(self.A, self.B)
 
     q_pos = 0.16
-    q_vel = 1.5
+    q_vel = 0.95
     self.Q = numpy.matrix([[(1.0 / (q_pos ** 2.0)), 0.0],
                            [0.0, (1.0 / (q_vel ** 2.0))]])
 
diff --git a/y2016/control_loops/python/wrist.py b/y2016/control_loops/python/wrist.py
index 660e577..f08f1a2 100755
--- a/y2016/control_loops/python/wrist.py
+++ b/y2016/control_loops/python/wrist.py
@@ -39,7 +39,7 @@
     # Gear ratio
     self.G = (56.0 / 12.0) * (54.0 / 14.0) * (64.0 / 18.0) * (48.0 / 16.0)
 
-    self.J = 0.20
+    self.J = 0.35
 
     # Control loop time step
     self.dt = 0.005