ClassCalculate edits