Added CE and PE Calc