Refactored move.