improve performance of drawing solution by making more efficient use of shapes, #4