changed around some template stuff