updated template w/ Mark's comments
View differences: inline side by side
Also available in: Unified diff
updated template w/ Mark's comments