modified templates for the new structure