Awards more badges
Merge conflicts