Readded CC support-part 2