adjustments to templating