added some template tags