+ some template changes