Fixing Game class