Changed gamestate api a bit