Changed to use graphics2d