Implementation work for #11 - Tweak for post-setup run