+1 for moving it, not sure about a new PR. I think we can do it here