More tweaks to the example