Now I get it, yeah, that seems sensible, but I agree that should be a separate follow-on PR.