Minor modifications to CCP model