Improve moving logic.