Update for new source ccl2ccl