switched to new template