hhmmm... yes, your way makes a lot more sense.  Committing the update after I test it.