Changes to end game logic