fixed the new template