@davefp you should check out my pull request! I think it helps to fix the issues you had with Ed's.