Refactored to match use of category used by smileyborg
Merge branch 'merge-smileyborg'