many changes to code/templates to keep up with M/G population efforts