Put back in the templates