This should be in another PR, but looks ok