Integrate next_stage() logic into next_move()