- Refactored and enable curve movement.