Adding puzzles to build, and rebuilding