more work on puzzles