Partial move to CCM