Optimize the rest of the CP