Updated CC setup