Tweaks to CC