2DGraphics week2 improved