Templating effort

update

update