Updated for CCL