Added inertia-momentum calculation