changed the templates a bit