implemented the new template