Further optimised the CPS.