removed the inertia bits, added .stop stubs