new template structure fix