Updates to intertia stuff