OK copied this out of your last PR. Better?