Templating added back.