some changed to the game class