replaced with new template structure