Done in the other PR I just opened