now works for rigid_rig too