Major update on the game class