more cg updates
Merge pull request #2353 from tysonn/master

more cg updates