updates to templating