various changes to the templates