Final version attached.  Works fine now.