Reworked move handlers.