just rebasing Game_class brach