CP Improvements