Updated.  Appreciate the review @piavlo ;)  Let me know if you have any
more questions.