Marie - Here is the document with your most recent changes incorporated.   We should probably think about preparing a deemed ISDA with the same concepts included.  Thanks.