Changed around the templates a bit