[0.7.11.251] Rewrite logic of movement