final templating changes