a little work on the templates