Pre improved move interruption refactor.