Master2ub2

I think I understand now what I've been doing wrong.
Should be fixed now.
@dwightguth please review.

After this merge, I will send an email to the k-list telling everyone about the improvement.