Update to new template code, change body