added some template stuff