updated files and templates: