Added expanded puzzles etc