@radford are you willing to do that in this PR?