Added changes from Jim.  This is the version submitted.