update templating code
merge