More changes to game logic