changed the word troll
sjt fixes
Merge branch 'temp'