I think I've got it this time.  This version of the stored procedures should work.