More templates, issue #2