CHANGED: Improved movement.