Part 2 updated game state handling