Updated per peer review to use template