modified templating