updated templates for latest 'best practices'