Triangles

Merge this to move to triangles, improving performance significantly