Refactored moves