added squares, wedges, triangles, and edges