Refactored Movement