Refactored movement
Refactored movement