update to new template syntax