update to current templating