Correct calculations of PL, CC, etc when they are not used in SW calculations
Correct calculations of PL, CC, etc when they are not used in SW calculations