Changed implimentation of graphics2d