Committing latest updates on CAD C

Committing latest updates on CAD C