Back to movement working correctly for 1P.