templating changes