No double dipping
Merge branch 'no-cheating'