Amended templates
Amended templates