Rigid Force Redux Enhanced