Tweaks from John per Greg