some template improvment