Triangle and Quad initially working