Agreed. Thanks for taking this one. 

I might be obsessing too much about this :) hopefully, with the new commit I might be able to see things more clearly.