Updated puzzles to r9830