Updated mechanics