Restore previous move logic