Pulled in modifications from CCL