New edit of C&D
Merge pull request #2 from swang/C_AND_D_MOD

C and D mod