Reworking CutPlanner