more work on the templates