Rewrite MoveTo to fix unnatural movement