upgrade to new template syntax