Ollie's Leaf Puzzles — Extension Version