moved up the templates in the concat step