changes to templating