revised the templates