Refactored Move.