modified templating
merge