This is fantastic!  I really love how much your changes simplify this section of the code.  Great work. :sunglasses: