SketchAndCalc Updates