Change to convex polys, add graph construction