Calc optimizations
Calc optimizations