@jcoyne: Realized this was the only change to be made.  Updated it to use you syntax and removed previous commit.