Reverted to functional, but per-sector contour tracing