Happy to take  PR on this.