Improvements to the Pillar Walkthrough as per #10467