added in headers and templates