Cutting puzzles some slack
Merge branch 'puzzle'