updated templating