Curve Wizard is completely rewritten