Amended templates
Changed requirements