Refactored Moving for type simplicity