Made some changes to Game