Update CC mask to be smarter