Updated updateDrawing

And gamestate manager