changed to new template