Updated Template and made edits to 704 and 12133