A better CurveCP