altered some template work