Changes to model used for CG, including modified templates.
One change that would be added to the last commit - for some unknown
reason.