Added inertia (to be continued...)