More CA changes needed