Some Tuning on PWR Calc