Tweaking `move` logic