change to template structure