some template changes