ok, I'll move it into a separate PR