Done, I'll submit a PR for Hilary as well.