attempted to fixed replay issue
merged FreeJoint.cpp