@domcleal do you want to do that as part of this PR?