removed redundant fields from template.  Added support for new parameters