and to clarify, I think we can do that, but in a separate PR.