Changes to CalcExt