adapted templates to fit my needs and make better use of them