I thought we could do this in this very PR