Updated more logic in Game class