calculateMovement calculateStart small fix