Final commit for CC_04