Edited version of CC
Edited version of CC, resolved conflict