2nd try

I branched off yours and chery-picked my addition atop, so hopefully this will work. Let me know.

Jason