diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
index f33048475..20b7cc0e7 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.fasten.assurance.build/models/com.fasten.assurance.build.mps
@@ -2609,68 +2609,6 @@
     </node>
     <node concept="2G$12M" id="2MrvZqtGQDM" role="3989C9">
       <property role="TrG5h" value="com.mpsbasics.testutils" />
-      <node concept="1E1JtA" id="2MrvZqtDgLZ" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="com.mpsbasics.docx4j.diffx.lib" />
-        <property role="3LESm3" value="1cb48442-05da-4cad-b5c5-e31ddd69e322" />
-        <node concept="398BVA" id="2MrvZqtDh3X" role="3LF7KH">
-          <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-          <node concept="2Ry0Ak" id="2MrvZqtDhmt" role="iGT6I">
-            <property role="2Ry0Am" value="solutions" />
-            <node concept="2Ry0Ak" id="2MrvZqtDhCW" role="2Ry0An">
-              <property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib" />
-              <node concept="2Ry0Ak" id="2MrvZqtDhV1" role="2Ry0An">
-                <property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib.msd" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2MrvZqtDib6" role="3bR37C">
-          <node concept="3bR9La" id="2MrvZqtDib7" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2MrvZqtDib8" role="3bR37C">
-          <node concept="3bR9La" id="2MrvZqtDib9" role="1SiIV1">
-            <ref role="3bR37D" node="6hyv0iVPlFI" resolve="com.mpsbasics.docx4j.lib" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2MrvZqtDibn" role="3bR37C">
-          <node concept="1BurEX" id="2MrvZqtDibo" role="1SiIV1">
-            <node concept="398BVA" id="2MrvZqtDiba" role="1BurEY">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="2MrvZqtDibb" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="2MrvZqtDibc" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib" />
-                  <node concept="2Ry0Ak" id="2MrvZqtDibd" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="2MrvZqtDibe" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-diffx-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3rtmxn" id="4euqtkrusDM" role="3bR31x">
-          <node concept="3LXTmp" id="4euqtkrusDN" role="3rtmxm">
-            <node concept="3qWCbU" id="4euqtkrusDO" role="3LXTna">
-              <property role="3qWCbO" value="icons/**, resources/**" />
-            </node>
-            <node concept="398BVA" id="4euqtkrusDP" role="3LXTmr">
-              <ref role="398BVh" node="6hyv0iVPlDT" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="4euqtkrusDQ" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="4euqtkrusDR" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="1E1JtA" id="2MrvZqtDizQ" role="2G$12L">
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="com.mpsbasics.docx4j.testutils" />
@@ -2735,11 +2673,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="2MrvZqtDjUM" role="3bR37C">
-          <node concept="3bR9La" id="2MrvZqtDjUN" role="1SiIV1">
-            <ref role="3bR37D" node="2MrvZqtDgLZ" resolve="com.mpsbasics.docx4j.diffx.lib" />
-          </node>
-        </node>
       </node>
     </node>
     <node concept="2G$12M" id="6hyv0iVPlEc" role="3989C9">
diff --git a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
index 60d013c91..a288dc553 100644
--- a/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
+++ b/code/languages/com.mbeddr.formal.safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
@@ -2861,68 +2861,6 @@
     </node>
     <node concept="2G$12M" id="2MrvZqtDw3j" role="3989C9">
       <property role="TrG5h" value="com.mpsbasics.testutils" />
-      <node concept="1E1JtA" id="2MrvZqtDgLZ" role="2G$12L">
-        <property role="BnDLt" value="true" />
-        <property role="TrG5h" value="com.mpsbasics.docx4j.diffx.lib" />
-        <property role="3LESm3" value="1cb48442-05da-4cad-b5c5-e31ddd69e322" />
-        <node concept="398BVA" id="2MrvZqtDh3X" role="3LF7KH">
-          <ref role="398BVh" node="7he_lUum_$u" resolve="mpsbasics.code" />
-          <node concept="2Ry0Ak" id="2MrvZqtDhmt" role="iGT6I">
-            <property role="2Ry0Am" value="solutions" />
-            <node concept="2Ry0Ak" id="2MrvZqtDhCW" role="2Ry0An">
-              <property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib" />
-              <node concept="2Ry0Ak" id="2MrvZqtDhV1" role="2Ry0An">
-                <property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib.msd" />
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2MrvZqtDib6" role="3bR37C">
-          <node concept="3bR9La" id="2MrvZqtDib7" role="1SiIV1">
-            <ref role="3bR37D" to="ffeo:mXGwHwhVPj" resolve="JDK" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2MrvZqtDib8" role="3bR37C">
-          <node concept="3bR9La" id="2MrvZqtDib9" role="1SiIV1">
-            <ref role="3bR37D" node="7he_lUumABC" resolve="com.mpsbasics.docx4j.lib" />
-          </node>
-        </node>
-        <node concept="1SiIV0" id="2MrvZqtDibn" role="3bR37C">
-          <node concept="1BurEX" id="2MrvZqtDibo" role="1SiIV1">
-            <node concept="398BVA" id="2MrvZqtDiba" role="1BurEY">
-              <ref role="398BVh" node="7he_lUum_$u" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="2MrvZqtDibb" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="2MrvZqtDibc" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib" />
-                  <node concept="2Ry0Ak" id="2MrvZqtDibd" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="2MrvZqtDibe" role="2Ry0An">
-                      <property role="2Ry0Am" value="docx4j-diffx-11.4.9.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3rtmxn" id="4euqtkrusL0" role="3bR31x">
-          <node concept="3LXTmp" id="4euqtkrusL1" role="3rtmxm">
-            <node concept="3qWCbU" id="4euqtkrusL2" role="3LXTna">
-              <property role="3qWCbO" value="icons/**, resources/**" />
-            </node>
-            <node concept="398BVA" id="4euqtkrusL3" role="3LXTmr">
-              <ref role="398BVh" node="7he_lUum_$u" resolve="mpsbasics.code" />
-              <node concept="2Ry0Ak" id="4euqtkrusL4" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="4euqtkrusL5" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.mpsbasics.docx4j.diffx.lib" />
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
       <node concept="1E1JtA" id="2MrvZqtDizQ" role="2G$12L">
         <property role="BnDLt" value="true" />
         <property role="TrG5h" value="com.mpsbasics.docx4j.testutils" />
@@ -2987,11 +2925,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="2MrvZqtDjUM" role="3bR37C">
-          <node concept="3bR9La" id="2MrvZqtDjUN" role="1SiIV1">
-            <ref role="3bR37D" node="2MrvZqtDgLZ" resolve="com.mpsbasics.docx4j.diffx.lib" />
-          </node>
-        </node>
       </node>
     </node>
     <node concept="2G$12M" id="1k6eCQnESS5" role="3989C9">
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps
index 9ed8be0cb..2eb91d750 100644
--- a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps
+++ b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/models/test.com.fasten.safety.doc2word._010_simple_documents_tests@tests.mps
@@ -166,10 +166,14 @@
         <child id="1163668922816" name="ifTrue" index="3K4E3e" />
         <child id="1163668934364" name="ifFalse" index="3K4GZi" />
       </concept>
+      <concept id="1221737317277" name="jetbrains.mps.baseLanguage.structure.StaticInitializer" flags="lg" index="1Pe0a1">
+        <child id="1221737317278" name="statementList" index="1Pe0a2" />
+      </concept>
       <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
       <concept id="6329021646629104954" name="jetbrains.mps.baseLanguage.structure.SingleLineComment" flags="nn" index="3SKdUt">
         <child id="8356039341262087992" name="line" index="1aUNEU" />
       </concept>
+      <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
@@ -246,6 +250,14 @@
       <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
         <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
+      <concept id="540871147943773365" name="jetbrains.mps.baseLanguage.collections.structure.SingleArgumentSequenceOperation" flags="nn" index="25WWJ4">
+        <child id="540871147943773366" name="argument" index="25WWJ7" />
+      </concept>
+      <concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
+        <child id="1226511765987" name="elementType" index="2hN53Y" />
+      </concept>
+      <concept id="1226516258405" name="jetbrains.mps.baseLanguage.collections.structure.HashSetCreator" flags="nn" index="2i4dXS" />
+      <concept id="1160612413312" name="jetbrains.mps.baseLanguage.collections.structure.AddElementOperation" flags="nn" index="TSZUe" />
       <concept id="1240325842691" name="jetbrains.mps.baseLanguage.collections.structure.AsSequenceOperation" flags="nn" index="39bAoz" />
       <concept id="1225727723840" name="jetbrains.mps.baseLanguage.collections.structure.FindFirstOperation" flags="nn" index="1z4cxt" />
     </language>
@@ -301,6 +313,10 @@
               <ref role="3cqZAo" node="4ziKDEnefnp" resolve="newFile" />
             </node>
             <node concept="1jxXqW" id="4ziKDEnetE_" role="37wK5m" />
+            <node concept="10M0yZ" id="3egY5wRsiK_" role="37wK5m">
+              <ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
+              <ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
+            </node>
           </node>
         </node>
       </node>
@@ -350,6 +366,10 @@
               <ref role="3cqZAo" node="4ziKDEneKbr" resolve="newFile" />
             </node>
             <node concept="1jxXqW" id="4ziKDEneKbA" role="37wK5m" />
+            <node concept="10M0yZ" id="3egY5wRsj2U" role="37wK5m">
+              <ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
+              <ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
+            </node>
           </node>
         </node>
       </node>
@@ -399,6 +419,10 @@
               <ref role="3cqZAo" node="4ziKDEneKo_" resolve="newFile" />
             </node>
             <node concept="1jxXqW" id="4ziKDEneKoK" role="37wK5m" />
+            <node concept="10M0yZ" id="3egY5wRsjig" role="37wK5m">
+              <ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
+              <ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
+            </node>
           </node>
         </node>
       </node>
@@ -448,6 +472,10 @@
               <ref role="3cqZAo" node="4ziKDEnfS3L" resolve="newFile" />
             </node>
             <node concept="1jxXqW" id="4ziKDEnfS3W" role="37wK5m" />
+            <node concept="10M0yZ" id="3egY5wRsjsV" role="37wK5m">
+              <ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
+              <ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
+            </node>
           </node>
         </node>
       </node>
@@ -497,6 +525,10 @@
               <ref role="3cqZAo" node="2321JT9jM6C" resolve="newFile" />
             </node>
             <node concept="1jxXqW" id="2321JT9jM6N" role="37wK5m" />
+            <node concept="10M0yZ" id="3egY5wRsjI8" role="37wK5m">
+              <ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
+              <ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
+            </node>
           </node>
         </node>
       </node>
@@ -634,6 +666,10 @@
               <ref role="3cqZAo" node="2321JT9mejN" resolve="newFile" />
             </node>
             <node concept="1jxXqW" id="2321JT9mejY" role="37wK5m" />
+            <node concept="10M0yZ" id="3egY5wRsk6A" role="37wK5m">
+              <ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
+              <ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
+            </node>
           </node>
         </node>
       </node>
@@ -683,6 +719,10 @@
               <ref role="3cqZAo" node="3n9jAIZJvrh" resolve="newFile" />
             </node>
             <node concept="1jxXqW" id="3n9jAIZJvrs" role="37wK5m" />
+            <node concept="10M0yZ" id="3egY5wRskpk" role="37wK5m">
+              <ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
+              <ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
+            </node>
           </node>
         </node>
       </node>
@@ -1209,6 +1249,9 @@
             <node concept="37vLTw" id="4ziKDEnkSoA" role="37wK5m">
               <ref role="3cqZAo" node="4ziKDEnkQ9N" resolve="witnessFile" />
             </node>
+            <node concept="37vLTw" id="3egY5wRqEv2" role="37wK5m">
+              <ref role="3cqZAo" node="3egY5wRqwZw" resolve="prefixesOfLinesToIgnore" />
+            </node>
           </node>
         </node>
       </node>
@@ -1225,6 +1268,12 @@
           <ref role="3uigEE" to="z1c3:~Project" resolve="Project" />
         </node>
       </node>
+      <node concept="37vLTG" id="3egY5wRqwZw" role="3clF46">
+        <property role="TrG5h" value="prefixesOfLinesToIgnore" />
+        <node concept="2hMVRd" id="3egY5wRqAdx" role="1tU5fm">
+          <node concept="17QB3L" id="3egY5wRqAdz" role="2hN53Y" />
+        </node>
+      </node>
     </node>
   </node>
   <node concept="312cEu" id="4ziKDEneaC3">
@@ -1514,10 +1563,58 @@
               <ref role="3cqZAo" node="7YjSMFlzo6o" resolve="newFile" />
             </node>
             <node concept="1jxXqW" id="7YjSMFlzo6z" role="37wK5m" />
+            <node concept="10M0yZ" id="3egY5wRskHm" role="37wK5m">
+              <ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
+              <ref role="1PxDUh" node="3egY5wRs8fu" resolve="Utils" />
+            </node>
+          </node>
+        </node>
+      </node>
+    </node>
+  </node>
+  <node concept="312cEu" id="3egY5wRs8fu">
+    <property role="3GE5qa" value="utils" />
+    <property role="TrG5h" value="Utils" />
+    <node concept="2tJIrI" id="3egY5wRs8JA" role="jymVt" />
+    <node concept="Wx3nA" id="3egY5wRsaTL" role="jymVt">
+      <property role="TrG5h" value="PREFIXES_OF_LINES_TO_IGNORE" />
+      <node concept="3Tm1VV" id="3egY5wRs8Wp" role="1B3o_S" />
+      <node concept="2hMVRd" id="3egY5wRs99w" role="1tU5fm">
+        <node concept="17QB3L" id="3egY5wRsaqv" role="2hN53Y" />
+      </node>
+      <node concept="2ShNRf" id="3egY5wRsb1f" role="33vP2m">
+        <node concept="2i4dXS" id="3egY5wRsbBo" role="2ShVmc" />
+      </node>
+    </node>
+    <node concept="1Pe0a1" id="3egY5wRscD6" role="jymVt">
+      <node concept="3clFbS" id="3egY5wRscD8" role="1Pe0a2">
+        <node concept="3clFbF" id="3egY5wRscQs" role="3cqZAp">
+          <node concept="2OqwBi" id="3egY5wRsdMd" role="3clFbG">
+            <node concept="37vLTw" id="3egY5wRscQr" role="2Oq$k0">
+              <ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
+            </node>
+            <node concept="TSZUe" id="3egY5wRsh2Q" role="2OqNvi">
+              <node concept="Xl_RD" id="3egY5wRsh4H" role="25WWJ7">
+                <property role="Xl_RC" value="&lt;wp:extent cx=" />
+              </node>
+            </node>
+          </node>
+        </node>
+        <node concept="3clFbF" id="3egY5wRshf4" role="3cqZAp">
+          <node concept="2OqwBi" id="3egY5wRshf5" role="3clFbG">
+            <node concept="37vLTw" id="3egY5wRshf6" role="2Oq$k0">
+              <ref role="3cqZAo" node="3egY5wRsaTL" resolve="PREFIXES_OF_LINES_TO_IGNORE" />
+            </node>
+            <node concept="TSZUe" id="3egY5wRshf7" role="2OqNvi">
+              <node concept="Xl_RD" id="3egY5wRshf8" role="25WWJ7">
+                <property role="Xl_RC" value="&lt;a:ext cx=" />
+              </node>
+            </node>
           </node>
         </node>
       </node>
     </node>
+    <node concept="3Tm1VV" id="3egY5wRs8fv" role="1B3o_S" />
   </node>
 </model>
 
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_100_node_references.docx b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_100_node_references.docx
index 68f888bae..3eb4cd9fe 100644
Binary files a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_100_node_references.docx and b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_100_node_references.docx differ
diff --git a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_110_argument_over_hazards.docx b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_110_argument_over_hazards.docx
index 1fa148fbc..e6a9f9209 100644
Binary files a/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_110_argument_over_hazards.docx and b/code/languages/com.mbeddr.formal.safety/tests/test.com.fasten.safety.doc2word/test_witness/_110_argument_over_hazards.docx differ
diff --git a/code/languages/com.mpsbasics/.mps/modules.xml b/code/languages/com.mpsbasics/.mps/modules.xml
index 114a6c14c..87dacf675 100644
--- a/code/languages/com.mpsbasics/.mps/modules.xml
+++ b/code/languages/com.mpsbasics/.mps/modules.xml
@@ -6,7 +6,6 @@
       <modulePath path="$PROJECT_DIR$/languages/com.mpsbasics.pdfexporter/com.mpsbasics.pdfexporter.mpl" folder="pdfbox" />
       <modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.build/com.mpsbasics.build.msd" folder="" />
       <modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.docx4j.core/com.mpsbasics.docx4j.core.msd" folder="docx4j" />
-      <modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd" folder="docx4j" />
       <modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.docx4j.lib/com.mpsbasics.docx4j.lib.msd" folder="docx4j" />
       <modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.docx4j.sandbox/com.mpsbasics.docx4j.sandbox.msd" folder="docx4j" />
       <modulePath path="$PROJECT_DIR$/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd" folder="docx4j" />
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd
deleted file mode 100644
index ecdcc49e3..000000000
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.diffx.lib/com.mpsbasics.docx4j.diffx.lib.msd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<solution name="com.mpsbasics.docx4j.diffx.lib" uuid="1cb48442-05da-4cad-b5c5-e31ddd69e322" moduleVersion="0">
-  <models>
-    <modelRoot contentPath="${module}/lib" type="java_classes">
-      <sourceRoot location="docx4j-diffx-11.4.9.jar" />
-    </modelRoot>
-  </models>
-  <facets>
-    <facet type="java" compile="mps" classes="mps" ext="no">
-      <classes generated="true" path="${module}/classes_gen" />
-      <library location="${module}/lib/docx4j-diffx-11.4.9.jar" />
-    </facet>
-  </facets>
-  <dependencies>
-    <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
-    <dependency reexport="false">71bb25aa-20fa-4c18-8954-1b176576f52d(com.mpsbasics.docx4j.lib)</dependency>
-  </dependencies>
-  <languageVersions>
-    <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
-    <language slang="l:f2801650-65d5-424e-bb1b-463a8781b786:jetbrains.mps.baseLanguage.javadoc" version="2" />
-    <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
-    <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
-  </languageVersions>
-  <dependencyVersions>
-    <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="1cb48442-05da-4cad-b5c5-e31ddd69e322(com.mpsbasics.docx4j.diffx.lib)" version="0" />
-    <module reference="71bb25aa-20fa-4c18-8954-1b176576f52d(com.mpsbasics.docx4j.lib)" version="0" />
-  </dependencyVersions>
-</solution>
-
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd
index eb751678e..90878d834 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/com.mpsbasics.docx4j.testutils.msd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <solution name="com.mpsbasics.docx4j.testutils" uuid="5f04c496-eb21-4501-981b-4e5fc2ab46ec" moduleVersion="0">
   <models>
-    <modelRoot contentPath="${module}" type="default">
+    <modelRoot type="default" contentPath="${module}">
       <sourceRoot location="models" />
     </modelRoot>
   </models>
@@ -13,16 +13,17 @@
   <dependencies>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
     <dependency reexport="false">71bb25aa-20fa-4c18-8954-1b176576f52d(com.mpsbasics.docx4j.lib)</dependency>
-    <dependency reexport="false">1cb48442-05da-4cad-b5c5-e31ddd69e322(com.mpsbasics.docx4j.diffx.lib)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
+    <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
+    <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="2" />
+    <language slang="l:760a0a8c-eabb-4521-8bfd-65db761a9ba3:jetbrains.mps.baseLanguage.logging" version="0" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="1cb48442-05da-4cad-b5c5-e31ddd69e322(com.mpsbasics.docx4j.diffx.lib)" version="0" />
     <module reference="71bb25aa-20fa-4c18-8954-1b176576f52d(com.mpsbasics.docx4j.lib)" version="0" />
     <module reference="5f04c496-eb21-4501-981b-4e5fc2ab46ec(com.mpsbasics.docx4j.testutils)" version="0" />
   </dependencyVersions>
diff --git a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps
index c3a6123d4..848d0bd40 100644
--- a/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps
+++ b/code/languages/com.mpsbasics/solutions/com.mpsbasics.docx4j.testutils/models/com.mpsbasics.docx4j.testutils.mps
@@ -5,37 +5,41 @@
   <languages>
     <use id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core" version="2" />
     <use id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage" version="12" />
+    <use id="760a0a8c-eabb-4521-8bfd-65db761a9ba3" name="jetbrains.mps.baseLanguage.logging" version="0" />
+    <use id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections" version="2" />
   </languages>
   <imports>
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
-    <import index="b79t" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.xml.transform.stream(JDK/)" />
-    <import index="vgdk" ref="71bb25aa-20fa-4c18-8954-1b176576f52d/java:org.docx4j.wml(com.mpsbasics.docx4j.lib/)" />
-    <import index="cpcb" ref="71bb25aa-20fa-4c18-8954-1b176576f52d/java:org.docx4j.openpackaging(com.mpsbasics.docx4j.lib/)" />
     <import index="8prx" ref="71bb25aa-20fa-4c18-8954-1b176576f52d/java:org.docx4j.openpackaging.parts(com.mpsbasics.docx4j.lib/)" />
-    <import index="33ny" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util(JDK/)" />
     <import index="5zxs" ref="71bb25aa-20fa-4c18-8954-1b176576f52d/java:org.docx4j.openpackaging.packages(com.mpsbasics.docx4j.lib/)" />
     <import index="wyt6" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.lang(JDK/)" />
-    <import index="mtwz" ref="1cb48442-05da-4cad-b5c5-e31ddd69e322/java:org.docx4j.diff(com.mpsbasics.docx4j.diffx.lib/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
-      <concept id="1080223426719" name="jetbrains.mps.baseLanguage.structure.OrExpression" flags="nn" index="22lmx$" />
       <concept id="1215693861676" name="jetbrains.mps.baseLanguage.structure.BaseAssignmentExpression" flags="nn" index="d038R">
         <child id="1068498886297" name="rValue" index="37vLTx" />
         <child id="1068498886295" name="lValue" index="37vLTJ" />
       </concept>
+      <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
         <child id="8118189177080264854" name="alternative" index="nSUat" />
       </concept>
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
+      <concept id="1239714755177" name="jetbrains.mps.baseLanguage.structure.AbstractUnaryNumberOperation" flags="nn" index="2$Kvd9">
+        <child id="1239714902950" name="expression" index="2$L3a6" />
+      </concept>
+      <concept id="1173175405605" name="jetbrains.mps.baseLanguage.structure.ArrayAccessExpression" flags="nn" index="AH0OO">
+        <child id="1173175577737" name="index" index="AHEQo" />
+        <child id="1173175590490" name="array" index="AHHXb" />
+      </concept>
+      <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
+        <child id="1154032183016" name="body" index="2LFqv$" />
+      </concept>
       <concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
         <child id="1197027771414" name="operand" index="2Oq$k0" />
         <child id="1197027833540" name="operation" index="2OqNvi" />
       </concept>
-      <concept id="1145552977093" name="jetbrains.mps.baseLanguage.structure.GenericNewExpression" flags="nn" index="2ShNRf">
-        <child id="1145553007750" name="creator" index="2ShVmc" />
-      </concept>
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
@@ -47,11 +51,10 @@
       <concept id="1070533707846" name="jetbrains.mps.baseLanguage.structure.StaticFieldReference" flags="nn" index="10M0yZ">
         <reference id="1144433057691" name="classifier" index="1PxDUh" />
       </concept>
-      <concept id="1070534058343" name="jetbrains.mps.baseLanguage.structure.NullLiteral" flags="nn" index="10Nm6u" />
+      <concept id="1070534370425" name="jetbrains.mps.baseLanguage.structure.IntegerType" flags="in" index="10Oyi0" />
       <concept id="1070534644030" name="jetbrains.mps.baseLanguage.structure.BooleanType" flags="in" index="10P_77" />
-      <concept id="1070534934090" name="jetbrains.mps.baseLanguage.structure.CastExpression" flags="nn" index="10QFUN">
-        <child id="1070534934091" name="type" index="10QFUM" />
-        <child id="1070534934092" name="expression" index="10QFUP" />
+      <concept id="1070534760951" name="jetbrains.mps.baseLanguage.structure.ArrayType" flags="in" index="10Q1$e">
+        <child id="1070534760952" name="componentType" index="10Q1$1" />
       </concept>
       <concept id="1068390468198" name="jetbrains.mps.baseLanguage.structure.ClassConcept" flags="ig" index="312cEu" />
       <concept id="1068431474542" name="jetbrains.mps.baseLanguage.structure.VariableDeclaration" flags="ng" index="33uBYm">
@@ -63,6 +66,7 @@
       <concept id="1068498886292" name="jetbrains.mps.baseLanguage.structure.ParameterDeclaration" flags="ir" index="37vLTG" />
       <concept id="1068498886294" name="jetbrains.mps.baseLanguage.structure.AssignmentExpression" flags="nn" index="37vLTI" />
       <concept id="1225271177708" name="jetbrains.mps.baseLanguage.structure.StringType" flags="in" index="17QB3L" />
+      <concept id="1225271546410" name="jetbrains.mps.baseLanguage.structure.TrimOperation" flags="nn" index="17S1cR" />
       <concept id="4972933694980447171" name="jetbrains.mps.baseLanguage.structure.BaseVariableDeclaration" flags="ng" index="19Szcq">
         <child id="5680397130376446158" name="type" index="1tU5fm" />
       </concept>
@@ -82,7 +86,12 @@
       <concept id="1068580123136" name="jetbrains.mps.baseLanguage.structure.StatementList" flags="sn" stub="5293379017992965193" index="3clFbS">
         <child id="1068581517665" name="statement" index="3cqZAp" />
       </concept>
-      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT" />
+      <concept id="1068580123137" name="jetbrains.mps.baseLanguage.structure.BooleanConstant" flags="nn" index="3clFbT">
+        <property id="1068580123138" name="value" index="3clFbU" />
+      </concept>
+      <concept id="1068580320020" name="jetbrains.mps.baseLanguage.structure.IntegerConstant" flags="nn" index="3cmrfG">
+        <property id="1068580320021" name="value" index="3cmrfH" />
+      </concept>
       <concept id="1068581242875" name="jetbrains.mps.baseLanguage.structure.PlusExpression" flags="nn" index="3cpWs3" />
       <concept id="1068581242878" name="jetbrains.mps.baseLanguage.structure.ReturnStatement" flags="nn" index="3cpWs6">
         <child id="1068581517676" name="expression" index="3cqZAk" />
@@ -91,9 +100,7 @@
         <child id="1068581242865" name="localVariableDeclaration" index="3cpWs9" />
       </concept>
       <concept id="1068581242863" name="jetbrains.mps.baseLanguage.structure.LocalVariableDeclaration" flags="nr" index="3cpWsn" />
-      <concept id="1079359253375" name="jetbrains.mps.baseLanguage.structure.ParenthesizedExpression" flags="nn" index="1eOMI4">
-        <child id="1079359253376" name="expression" index="1eOMHV" />
-      </concept>
+      <concept id="1081506773034" name="jetbrains.mps.baseLanguage.structure.LessThanExpression" flags="nn" index="3eOVzh" />
       <concept id="1081516740877" name="jetbrains.mps.baseLanguage.structure.NotExpression" flags="nn" index="3fqX7Q">
         <child id="1081516765348" name="expression" index="3fr31v" />
       </concept>
@@ -101,7 +108,6 @@
         <reference id="1068499141037" name="baseMethodDeclaration" index="37wK5l" />
         <child id="1068499141038" name="actualArgument" index="37wK5m" />
       </concept>
-      <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
@@ -112,33 +118,55 @@
         <child id="1081773367579" name="rightExpression" index="3uHU7w" />
         <child id="1081773367580" name="leftExpression" index="3uHU7B" />
       </concept>
+      <concept id="1214918800624" name="jetbrains.mps.baseLanguage.structure.PostfixIncrementExpression" flags="nn" index="3uNrnE" />
       <concept id="3093926081414150598" name="jetbrains.mps.baseLanguage.structure.MultipleCatchClause" flags="ng" index="3uVAMA">
         <child id="8276990574895933173" name="catchBody" index="1zc67A" />
         <child id="8276990574895933172" name="throwable" index="1zc67B" />
       </concept>
+      <concept id="1081855346303" name="jetbrains.mps.baseLanguage.structure.BreakStatement" flags="nn" index="3zACq4" />
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ngI" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
+        <child id="1144230900587" name="variable" index="1Duv9x" />
+      </concept>
+      <concept id="1144231330558" name="jetbrains.mps.baseLanguage.structure.ForStatement" flags="nn" index="1Dw8fO">
+        <child id="1144231399730" name="condition" index="1Dwp0S" />
+        <child id="1144231408325" name="iteration" index="1Dwrff" />
+      </concept>
       <concept id="5351203823916750322" name="jetbrains.mps.baseLanguage.structure.TryUniversalStatement" flags="nn" index="3J1_TO">
         <child id="8276990574886367510" name="catchClause" index="1zxBo5" />
         <child id="8276990574886367508" name="body" index="1zxBo7" />
       </concept>
+      <concept id="1163668896201" name="jetbrains.mps.baseLanguage.structure.TernaryOperatorExpression" flags="nn" index="3K4zz7">
+        <child id="1163668914799" name="condition" index="3K4Cdx" />
+        <child id="1163668922816" name="ifTrue" index="3K4E3e" />
+        <child id="1163668934364" name="ifFalse" index="3K4GZi" />
+      </concept>
+      <concept id="1082113931046" name="jetbrains.mps.baseLanguage.structure.ContinueStatement" flags="nn" index="3N13vt" />
+      <concept id="1208890769693" name="jetbrains.mps.baseLanguage.structure.ArrayLengthOperation" flags="nn" index="1Rwk04" />
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
     </language>
-    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
-      <concept id="1133920641626" name="jetbrains.mps.lang.core.structure.BaseConcept" flags="ng" index="2VYdi">
-        <child id="5169995583184591170" name="smodelAttribute" index="lGtFl" />
+    <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
+      <concept id="2524418899405758586" name="jetbrains.mps.baseLanguage.closures.structure.InferredClosureParameterDeclaration" flags="ig" index="gl6BB" />
+      <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
+        <child id="1199569906740" name="parameter" index="1bW2Oz" />
+        <child id="1199569916463" name="body" index="1bW5cS" />
       </concept>
+    </language>
+    <language id="ceab5195-25ea-4f22-9b92-103b95ca8c0c" name="jetbrains.mps.lang.core">
       <concept id="1169194658468" name="jetbrains.mps.lang.core.structure.INamedConcept" flags="ngI" index="TrEIO">
         <property id="1169194664001" name="name" index="TrG5h" />
       </concept>
-      <concept id="709746936026466394" name="jetbrains.mps.lang.core.structure.ChildAttribute" flags="ng" index="3VBwX9">
-        <property id="709746936026609031" name="linkId" index="3V$3ak" />
-        <property id="709746936026609029" name="role_DebugInfo" index="3V$3am" />
+    </language>
+    <language id="83888646-71ce-4f1c-9c53-c54016f6ad4f" name="jetbrains.mps.baseLanguage.collections">
+      <concept id="1204796164442" name="jetbrains.mps.baseLanguage.collections.structure.InternalSequenceOperation" flags="nn" index="23sCx2">
+        <child id="1204796294226" name="closure" index="23t8la" />
       </concept>
-      <concept id="4452961908202556907" name="jetbrains.mps.lang.core.structure.BaseCommentAttribute" flags="ng" index="1X3_iC">
-        <child id="3078666699043039389" name="commentedNode" index="8Wnug" />
+      <concept id="1226511727824" name="jetbrains.mps.baseLanguage.collections.structure.SetType" flags="in" index="2hMVRd">
+        <child id="1226511765987" name="elementType" index="2hN53Y" />
       </concept>
+      <concept id="1235566554328" name="jetbrains.mps.baseLanguage.collections.structure.AnyOperation" flags="nn" index="2HwmR7" />
     </language>
   </registry>
   <node concept="312cEu" id="4ziKDEn8YET">
@@ -147,13 +175,7 @@
     <node concept="2YIFZL" id="4ziKDEn8YGk" role="jymVt">
       <property role="TrG5h" value="compare" />
       <node concept="3clFbS" id="4ziKDEn8YGn" role="3clF47">
-        <node concept="3cpWs8" id="4ziKDEn90jU" role="3cqZAp">
-          <node concept="3cpWsn" id="4ziKDEn90jT" role="3cpWs9">
-            <property role="TrG5h" value="contentStr" />
-            <node concept="17QB3L" id="4ziKDEne7Kg" role="1tU5fm" />
-          </node>
-        </node>
-        <node concept="3clFbH" id="4ziKDEndhVy" role="3cqZAp" />
+        <node concept="3clFbH" id="4WhNU8SBFpr" role="3cqZAp" />
         <node concept="3J1_TO" id="4ziKDEn98D$" role="3cqZAp">
           <node concept="3uVAMA" id="4ziKDEn98PH" role="1zxBo5">
             <node concept="XOnhg" id="4ziKDEn98PI" role="1zc67B">
@@ -198,7 +220,7 @@
             </node>
             <node concept="3cpWs8" id="4ziKDEn90jc" role="3cqZAp">
               <node concept="3cpWsn" id="4ziKDEn90jb" role="3cpWs9">
-                <property role="TrG5h" value="olderPackage" />
+                <property role="TrG5h" value="witnessPackage" />
                 <node concept="3uibUv" id="4ziKDEn90jd" role="1tU5fm">
                   <ref role="3uigEE" to="5zxs:~WordprocessingMLPackage" resolve="WordprocessingMLPackage" />
                 </node>
@@ -211,284 +233,441 @@
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="4ziKDEn90ji" role="3cqZAp">
-              <node concept="3cpWsn" id="4ziKDEn90jh" role="3cpWs9">
-                <property role="TrG5h" value="newerBody" />
-                <node concept="3uibUv" id="4ziKDEn90jj" role="1tU5fm">
-                  <ref role="3uigEE" to="vgdk:~Body" resolve="Body" />
-                </node>
-                <node concept="2OqwBi" id="4ziKDEn90jk" role="33vP2m">
-                  <node concept="1eOMI4" id="4ziKDEn90jq" role="2Oq$k0">
-                    <node concept="10QFUN" id="4ziKDEn90jl" role="1eOMHV">
-                      <node concept="2OqwBi" id="4ziKDEn90jm" role="10QFUP">
-                        <node concept="2OqwBi" id="4ziKDEn90SH" role="2Oq$k0">
-                          <node concept="37vLTw" id="4ziKDEn90SG" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4ziKDEn90j5" resolve="newerPackage" />
-                          </node>
-                          <node concept="liA8E" id="4ziKDEn90SI" role="2OqNvi">
-                            <ref role="37wK5l" to="5zxs:~WordprocessingMLPackage.getMainDocumentPart()" resolve="getMainDocumentPart" />
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="4ziKDEn90jo" role="2OqNvi">
-                          <ref role="37wK5l" to="8prx:~JaxbXmlPart.getJaxbElement()" resolve="getJaxbElement" />
-                        </node>
-                      </node>
-                      <node concept="3uibUv" id="4ziKDEn90jp" role="10QFUM">
-                        <ref role="3uigEE" to="vgdk:~Document" resolve="Document" />
-                      </node>
+            <node concept="3clFbH" id="4WhNU8SEk0w" role="3cqZAp" />
+            <node concept="3cpWs8" id="4WhNU8SEtOB" role="3cqZAp">
+              <node concept="3cpWsn" id="4WhNU8SEtOC" role="3cpWs9">
+                <property role="TrG5h" value="xmlNew" />
+                <node concept="17QB3L" id="4WhNU8SEvBx" role="1tU5fm" />
+                <node concept="2OqwBi" id="4WhNU8SEtOD" role="33vP2m">
+                  <node concept="2OqwBi" id="4WhNU8SEtOE" role="2Oq$k0">
+                    <node concept="37vLTw" id="4WhNU8SEtOF" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4ziKDEn90j5" resolve="newerPackage" />
+                    </node>
+                    <node concept="liA8E" id="4WhNU8SEtOG" role="2OqNvi">
+                      <ref role="37wK5l" to="5zxs:~WordprocessingMLPackage.getMainDocumentPart()" resolve="getMainDocumentPart" />
                     </node>
                   </node>
-                  <node concept="liA8E" id="4ziKDEn90jr" role="2OqNvi">
-                    <ref role="37wK5l" to="vgdk:~Document.getBody()" resolve="getBody" />
+                  <node concept="liA8E" id="4WhNU8SEtOH" role="2OqNvi">
+                    <ref role="37wK5l" to="8prx:~JaxbXmlPart.getXML()" resolve="getXML" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="4ziKDEn90jt" role="3cqZAp">
-              <node concept="3cpWsn" id="4ziKDEn90js" role="3cpWs9">
-                <property role="TrG5h" value="olderBody" />
-                <node concept="3uibUv" id="4ziKDEn90ju" role="1tU5fm">
-                  <ref role="3uigEE" to="vgdk:~Body" resolve="Body" />
-                </node>
-                <node concept="2OqwBi" id="4ziKDEn90jv" role="33vP2m">
-                  <node concept="1eOMI4" id="4ziKDEn90j_" role="2Oq$k0">
-                    <node concept="10QFUN" id="4ziKDEn90jw" role="1eOMHV">
-                      <node concept="2OqwBi" id="4ziKDEn90jx" role="10QFUP">
-                        <node concept="2OqwBi" id="4ziKDEn90H2" role="2Oq$k0">
-                          <node concept="37vLTw" id="4ziKDEn90H1" role="2Oq$k0">
-                            <ref role="3cqZAo" node="4ziKDEn90jb" resolve="olderPackage" />
-                          </node>
-                          <node concept="liA8E" id="4ziKDEn90H3" role="2OqNvi">
-                            <ref role="37wK5l" to="5zxs:~WordprocessingMLPackage.getMainDocumentPart()" resolve="getMainDocumentPart" />
-                          </node>
-                        </node>
-                        <node concept="liA8E" id="4ziKDEn90jz" role="2OqNvi">
-                          <ref role="37wK5l" to="8prx:~JaxbXmlPart.getJaxbElement()" resolve="getJaxbElement" />
-                        </node>
-                      </node>
-                      <node concept="3uibUv" id="4ziKDEn90j$" role="10QFUM">
-                        <ref role="3uigEE" to="vgdk:~Document" resolve="Document" />
-                      </node>
+            <node concept="3cpWs8" id="4WhNU8SExaV" role="3cqZAp">
+              <node concept="3cpWsn" id="4WhNU8SExaY" role="3cpWs9">
+                <property role="TrG5h" value="xmlWitness" />
+                <node concept="17QB3L" id="4WhNU8SExaT" role="1tU5fm" />
+                <node concept="2OqwBi" id="4WhNU8SECHH" role="33vP2m">
+                  <node concept="2OqwBi" id="4WhNU8SE_s2" role="2Oq$k0">
+                    <node concept="37vLTw" id="4WhNU8SE$Aq" role="2Oq$k0">
+                      <ref role="3cqZAo" node="4ziKDEn90jb" resolve="witnessPackage" />
+                    </node>
+                    <node concept="liA8E" id="4WhNU8SEAGi" role="2OqNvi">
+                      <ref role="37wK5l" to="5zxs:~WordprocessingMLPackage.getMainDocumentPart()" resolve="getMainDocumentPart" />
                     </node>
                   </node>
-                  <node concept="liA8E" id="4ziKDEn90jA" role="2OqNvi">
-                    <ref role="37wK5l" to="vgdk:~Document.getBody()" resolve="getBody" />
+                  <node concept="liA8E" id="4WhNU8SEEQj" role="2OqNvi">
+                    <ref role="37wK5l" to="8prx:~JaxbXmlPart.getXML()" resolve="getXML" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbH" id="4ziKDEncSUW" role="3cqZAp" />
-            <node concept="3cpWs8" id="4ziKDEnducU" role="3cqZAp">
-              <node concept="3cpWsn" id="4ziKDEnducV" role="3cpWs9">
-                <property role="TrG5h" value="changeDate" />
-                <node concept="3uibUv" id="4ziKDEnducW" role="1tU5fm">
-                  <ref role="3uigEE" to="33ny:~Calendar" resolve="Calendar" />
+            <node concept="3clFbH" id="4WhNU8SEneg" role="3cqZAp" />
+            <node concept="3cpWs8" id="4WhNU8SEYbY" role="3cqZAp">
+              <node concept="3cpWsn" id="4WhNU8SEYbZ" role="3cpWs9">
+                <property role="TrG5h" value="res" />
+                <node concept="10P_77" id="4WhNU8SETN$" role="1tU5fm" />
+                <node concept="3clFbT" id="3egY5wRqRZp" role="33vP2m">
+                  <property role="3clFbU" value="true" />
                 </node>
-                <node concept="10Nm6u" id="4ziKDEndBdH" role="33vP2m" />
               </node>
             </node>
-            <node concept="3cpWs8" id="4ziKDEndOcR" role="3cqZAp">
-              <node concept="3cpWsn" id="4ziKDEndOcS" role="3cpWs9">
-                <property role="TrG5h" value="sw" />
-                <node concept="3uibUv" id="4ziKDEndOcT" role="1tU5fm">
-                  <ref role="3uigEE" to="guwi:~StringWriter" resolve="StringWriter" />
+            <node concept="3cpWs8" id="3egY5wRo95O" role="3cqZAp">
+              <node concept="3cpWsn" id="3egY5wRo95R" role="3cpWs9">
+                <property role="TrG5h" value="xmlNewLines" />
+                <node concept="10Q1$e" id="3egY5wRo9Uy" role="1tU5fm">
+                  <node concept="17QB3L" id="3egY5wRo95M" role="10Q1$1" />
                 </node>
-                <node concept="2ShNRf" id="4ziKDEndOzx" role="33vP2m">
-                  <node concept="1pGfFk" id="4ziKDEndP7x" role="2ShVmc">
-                    <ref role="37wK5l" to="guwi:~StringWriter.&lt;init&gt;()" resolve="StringWriter" />
+                <node concept="2OqwBi" id="3egY5wRocmN" role="33vP2m">
+                  <node concept="37vLTw" id="3egY5wRobeR" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4WhNU8SEtOC" resolve="xmlNew" />
+                  </node>
+                  <node concept="liA8E" id="3egY5wRoeq3" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~String.split(java.lang.String)" resolve="split" />
+                    <node concept="Xl_RD" id="3egY5wRof4v" role="37wK5m">
+                      <property role="Xl_RC" value="\n" />
+                    </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="4ziKDEndrRb" role="3cqZAp">
-              <node concept="3cpWsn" id="4ziKDEndrRc" role="3cpWs9">
-                <property role="TrG5h" value="result" />
-                <node concept="3uibUv" id="4ziKDEndrRd" role="1tU5fm">
-                  <ref role="3uigEE" to="b79t:~StreamResult" resolve="StreamResult" />
+            <node concept="3cpWs8" id="3egY5wRofWz" role="3cqZAp">
+              <node concept="3cpWsn" id="3egY5wRofW$" role="3cpWs9">
+                <property role="TrG5h" value="xmlWitnessLines" />
+                <node concept="10Q1$e" id="3egY5wRofW_" role="1tU5fm">
+                  <node concept="17QB3L" id="3egY5wRofWA" role="10Q1$1" />
                 </node>
-                <node concept="2ShNRf" id="4ziKDEndsqg" role="33vP2m">
-                  <node concept="1pGfFk" id="4ziKDEndsTq" role="2ShVmc">
-                    <ref role="37wK5l" to="b79t:~StreamResult.&lt;init&gt;(java.io.Writer)" resolve="StreamResult" />
-                    <node concept="37vLTw" id="4ziKDEndPaO" role="37wK5m">
-                      <ref role="3cqZAo" node="4ziKDEndOcS" resolve="sw" />
+                <node concept="2OqwBi" id="3egY5wRofWB" role="33vP2m">
+                  <node concept="37vLTw" id="3egY5wRofWC" role="2Oq$k0">
+                    <ref role="3cqZAo" node="4WhNU8SExaY" resolve="xmlWitness" />
+                  </node>
+                  <node concept="liA8E" id="3egY5wRofWD" role="2OqNvi">
+                    <ref role="37wK5l" to="wyt6:~String.split(java.lang.String)" resolve="split" />
+                    <node concept="Xl_RD" id="3egY5wRofWE" role="37wK5m">
+                      <property role="Xl_RC" value="\n" />
                     </node>
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3cpWs8" id="4ziKDEndoYq" role="3cqZAp">
-              <node concept="3cpWsn" id="4ziKDEndoYr" role="3cpWs9">
-                <property role="TrG5h" value="pd" />
-                <node concept="3uibUv" id="4ziKDEndoYs" role="1tU5fm">
-                  <ref role="3uigEE" to="mtwz:~Differencer" resolve="Differencer" />
-                </node>
-                <node concept="2ShNRf" id="4ziKDEndpgL" role="33vP2m">
-                  <node concept="1pGfFk" id="5QnufgdhSQ1" role="2ShVmc">
-                    <ref role="37wK5l" to="mtwz:~Differencer.&lt;init&gt;()" resolve="Differencer" />
+            <node concept="3cpWs8" id="3egY5wRoiMI" role="3cqZAp">
+              <node concept="3cpWsn" id="3egY5wRoiML" role="3cpWs9">
+                <property role="TrG5h" value="minLen" />
+                <node concept="10Oyi0" id="3egY5wRoiMG" role="1tU5fm" />
+                <node concept="3K4zz7" id="3egY5wRoqFS" role="33vP2m">
+                  <node concept="2OqwBi" id="3egY5wRorzc" role="3K4E3e">
+                    <node concept="37vLTw" id="3egY5wRor7w" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3egY5wRo95R" resolve="xmlNewLines" />
+                    </node>
+                    <node concept="1Rwk04" id="3egY5wRosZ8" role="2OqNvi" />
+                  </node>
+                  <node concept="3eOVzh" id="3egY5wRonSP" role="3K4Cdx">
+                    <node concept="2OqwBi" id="3egY5wRophk" role="3uHU7w">
+                      <node concept="37vLTw" id="3egY5wRooqa" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3egY5wRofW$" resolve="xmlWitnessLines" />
+                      </node>
+                      <node concept="1Rwk04" id="3egY5wRoq2X" role="2OqNvi" />
+                    </node>
+                    <node concept="2OqwBi" id="3egY5wRolmW" role="3uHU7B">
+                      <node concept="37vLTw" id="3egY5wRokA2" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3egY5wRo95R" resolve="xmlNewLines" />
+                      </node>
+                      <node concept="1Rwk04" id="3egY5wRomev" role="2OqNvi" />
+                    </node>
+                  </node>
+                  <node concept="2OqwBi" id="3egY5wRotQ3" role="3K4GZi">
+                    <node concept="37vLTw" id="3egY5wRotQ4" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3egY5wRofW$" resolve="xmlWitnessLines" />
+                    </node>
+                    <node concept="1Rwk04" id="3egY5wRotQ5" role="2OqNvi" />
                   </node>
                 </node>
               </node>
             </node>
-            <node concept="3clFbF" id="4ziKDEndqcX" role="3cqZAp">
-              <node concept="2OqwBi" id="4ziKDEndqu$" role="3clFbG">
-                <node concept="37vLTw" id="4ziKDEndqcV" role="2Oq$k0">
-                  <ref role="3cqZAo" node="4ziKDEndoYr" resolve="pd" />
-                </node>
-                <node concept="liA8E" id="4ziKDEndqNs" role="2OqNvi">
-                  <ref role="37wK5l" to="mtwz:~Differencer.diff(org.docx4j.wml.Body,org.docx4j.wml.Body,javax.xml.transform.Result,java.lang.String,java.util.Calendar,org.docx4j.openpackaging.parts.relationships.RelationshipsPart,org.docx4j.openpackaging.parts.relationships.RelationshipsPart)" resolve="diff" />
-                  <node concept="37vLTw" id="4ziKDEndqQl" role="37wK5m">
-                    <ref role="3cqZAo" node="4ziKDEn90jh" resolve="newerBody" />
-                  </node>
-                  <node concept="37vLTw" id="4ziKDEndqYu" role="37wK5m">
-                    <ref role="3cqZAo" node="4ziKDEn90js" resolve="olderBody" />
+            <node concept="1Dw8fO" id="3egY5wRovk2" role="3cqZAp">
+              <node concept="3clFbS" id="3egY5wRovk4" role="2LFqv$">
+                <node concept="3cpWs8" id="3egY5wRruMs" role="3cqZAp">
+                  <node concept="3cpWsn" id="3egY5wRruMt" role="3cpWs9">
+                    <property role="TrG5h" value="crtXmlNewLine" />
+                    <node concept="17QB3L" id="3egY5wRrsUk" role="1tU5fm" />
+                    <node concept="2OqwBi" id="3egY5wRrO2F" role="33vP2m">
+                      <node concept="AH0OO" id="3egY5wRruMu" role="2Oq$k0">
+                        <node concept="37vLTw" id="3egY5wRruMv" role="AHEQo">
+                          <ref role="3cqZAo" node="3egY5wRovk5" resolve="idx" />
+                        </node>
+                        <node concept="37vLTw" id="3egY5wRruMw" role="AHHXb">
+                          <ref role="3cqZAo" node="3egY5wRo95R" resolve="xmlNewLines" />
+                        </node>
+                      </node>
+                      <node concept="17S1cR" id="3egY5wRrQBq" role="2OqNvi" />
+                    </node>
                   </node>
-                  <node concept="37vLTw" id="4ziKDEndsWJ" role="37wK5m">
-                    <ref role="3cqZAo" node="4ziKDEndrRc" resolve="result" />
+                </node>
+                <node concept="3cpWs8" id="3egY5wRrB_N" role="3cqZAp">
+                  <node concept="3cpWsn" id="3egY5wRrB_O" role="3cpWs9">
+                    <property role="TrG5h" value="crtXmlWitnessLine" />
+                    <node concept="17QB3L" id="3egY5wRrA22" role="1tU5fm" />
+                    <node concept="2OqwBi" id="3egY5wRrS5j" role="33vP2m">
+                      <node concept="AH0OO" id="3egY5wRrB_P" role="2Oq$k0">
+                        <node concept="37vLTw" id="3egY5wRrB_Q" role="AHEQo">
+                          <ref role="3cqZAo" node="3egY5wRovk5" resolve="idx" />
+                        </node>
+                        <node concept="37vLTw" id="3egY5wRrB_R" role="AHHXb">
+                          <ref role="3cqZAo" node="3egY5wRofW$" resolve="xmlWitnessLines" />
+                        </node>
+                      </node>
+                      <node concept="17S1cR" id="3egY5wRrUfg" role="2OqNvi" />
+                    </node>
                   </node>
-                  <node concept="Xl_RD" id="4ziKDEndt6s" role="37wK5m">
-                    <property role="Xl_RC" value="lucky luke" />
+                </node>
+                <node concept="3clFbJ" id="3egY5wRrklT" role="3cqZAp">
+                  <node concept="3clFbS" id="3egY5wRrklV" role="3clFbx">
+                    <node concept="3N13vt" id="3egY5wRrsAk" role="3cqZAp" />
                   </node>
-                  <node concept="37vLTw" id="4ziKDEnduLQ" role="37wK5m">
-                    <ref role="3cqZAo" node="4ziKDEnducV" resolve="changeDate" />
+                  <node concept="2OqwBi" id="3egY5wRroGf" role="3clFbw">
+                    <node concept="37vLTw" id="3egY5wRrlTI" role="2Oq$k0">
+                      <ref role="3cqZAo" node="3egY5wRqwZw" resolve="prefixesOfLinesToIgnore" />
+                    </node>
+                    <node concept="2HwmR7" id="3egY5wRrqY_" role="2OqNvi">
+                      <node concept="1bVj0M" id="3egY5wRrqYB" role="23t8la">
+                        <node concept="3clFbS" id="3egY5wRrqYC" role="1bW5cS">
+                          <node concept="3clFbF" id="3egY5wRrVV1" role="3cqZAp">
+                            <node concept="2OqwBi" id="3egY5wRrYRH" role="3clFbG">
+                              <node concept="37vLTw" id="3egY5wRrVV0" role="2Oq$k0">
+                                <ref role="3cqZAo" node="3egY5wRruMt" resolve="crtXmlNewLine" />
+                              </node>
+                              <node concept="liA8E" id="3egY5wRs0Li" role="2OqNvi">
+                                <ref role="37wK5l" to="wyt6:~String.startsWith(java.lang.String)" resolve="startsWith" />
+                                <node concept="37vLTw" id="3egY5wRs2bb" role="37wK5m">
+                                  <ref role="3cqZAo" node="3egY5wRrqYD" resolve="it" />
+                                </node>
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                        <node concept="gl6BB" id="3egY5wRrqYD" role="1bW2Oz">
+                          <property role="TrG5h" value="it" />
+                          <node concept="2jxLKc" id="3egY5wRrqYE" role="1tU5fm" />
+                        </node>
+                      </node>
+                    </node>
                   </node>
-                  <node concept="2OqwBi" id="4ziKDEndwc3" role="37wK5m">
-                    <node concept="2OqwBi" id="4ziKDEndvaT" role="2Oq$k0">
-                      <node concept="37vLTw" id="4ziKDEnduWd" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4ziKDEn90j5" resolve="newerPackage" />
+                </node>
+                <node concept="3clFbH" id="3egY5wRrGFY" role="3cqZAp" />
+                <node concept="3clFbJ" id="3egY5wRoAxI" role="3cqZAp">
+                  <node concept="3clFbS" id="3egY5wRoAxK" role="3clFbx">
+                    <node concept="3clFbF" id="3egY5wRqVJt" role="3cqZAp">
+                      <node concept="37vLTI" id="3egY5wRqXQP" role="3clFbG">
+                        <node concept="3clFbT" id="3egY5wRqYA0" role="37vLTx" />
+                        <node concept="37vLTw" id="3egY5wRqVJr" role="37vLTJ">
+                          <ref role="3cqZAo" node="4WhNU8SEYbZ" resolve="res" />
+                        </node>
+                      </node>
+                    </node>
+                    <node concept="3clFbF" id="3egY5wRoJ8v" role="3cqZAp">
+                      <node concept="2OqwBi" id="3egY5wRoJ8s" role="3clFbG">
+                        <node concept="10M0yZ" id="3egY5wRoJ8t" role="2Oq$k0">
+                          <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                          <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
+                        </node>
+                        <node concept="liA8E" id="3egY5wRoJ8u" role="2OqNvi">
+                          <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                          <node concept="3cpWs3" id="3egY5wRoNuB" role="37wK5m">
+                            <node concept="37vLTw" id="3egY5wRoNZj" role="3uHU7w">
+                              <ref role="3cqZAo" node="3egY5wRovk5" resolve="idx" />
+                            </node>
+                            <node concept="Xl_RD" id="3egY5wRoJTp" role="3uHU7B">
+                              <property role="Xl_RC" value="Comparison failure with differences on line " />
+                            </node>
+                          </node>
+                        </node>
                       </node>
-                      <node concept="liA8E" id="4ziKDEndvxG" role="2OqNvi">
-                        <ref role="37wK5l" to="5zxs:~WordprocessingMLPackage.getMainDocumentPart()" resolve="getMainDocumentPart" />
+                    </node>
+                    <node concept="3clFbF" id="3egY5wRoRpH" role="3cqZAp">
+                      <node concept="2OqwBi" id="3egY5wRoRpI" role="3clFbG">
+                        <node concept="10M0yZ" id="3egY5wRoRpJ" role="2Oq$k0">
+                          <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                          <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
+                        </node>
+                        <node concept="liA8E" id="3egY5wRoRpK" role="2OqNvi">
+                          <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                          <node concept="3cpWs3" id="3egY5wRp1OJ" role="37wK5m">
+                            <node concept="Xl_RD" id="3egY5wRp39e" role="3uHU7w">
+                              <property role="Xl_RC" value="'" />
+                            </node>
+                            <node concept="3cpWs3" id="3egY5wRoRpL" role="3uHU7B">
+                              <node concept="Xl_RD" id="3egY5wRoRpN" role="3uHU7B">
+                                <property role="Xl_RC" value="\tWitness line: '" />
+                              </node>
+                              <node concept="37vLTw" id="3egY5wRrB_T" role="3uHU7w">
+                                <ref role="3cqZAo" node="3egY5wRrB_O" resolve="crtXmlWitnessLine" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="4ziKDEndy$M" role="2OqNvi">
-                      <ref role="37wK5l" to="cpcb:~Base.getRelationshipsPart()" resolve="getRelationshipsPart" />
+                    <node concept="3clFbF" id="3egY5wRpbTl" role="3cqZAp">
+                      <node concept="2OqwBi" id="3egY5wRpbTm" role="3clFbG">
+                        <node concept="10M0yZ" id="3egY5wRpbTn" role="2Oq$k0">
+                          <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                          <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
+                        </node>
+                        <node concept="liA8E" id="3egY5wRpbTo" role="2OqNvi">
+                          <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                          <node concept="3cpWs3" id="3egY5wRpbTp" role="37wK5m">
+                            <node concept="Xl_RD" id="3egY5wRpbTq" role="3uHU7w">
+                              <property role="Xl_RC" value="'" />
+                            </node>
+                            <node concept="3cpWs3" id="3egY5wRpbTr" role="3uHU7B">
+                              <node concept="Xl_RD" id="3egY5wRpbTs" role="3uHU7B">
+                                <property role="Xl_RC" value="\tNew line: '" />
+                              </node>
+                              <node concept="37vLTw" id="3egY5wRruMy" role="3uHU7w">
+                                <ref role="3cqZAo" node="3egY5wRruMt" resolve="crtXmlNewLine" />
+                              </node>
+                            </node>
+                          </node>
+                        </node>
+                      </node>
                     </node>
+                    <node concept="3zACq4" id="3egY5wRr25g" role="3cqZAp" />
                   </node>
-                  <node concept="2OqwBi" id="4ziKDEnd$tl" role="37wK5m">
-                    <node concept="2OqwBi" id="4ziKDEndzk0" role="2Oq$k0">
-                      <node concept="37vLTw" id="4ziKDEndyZY" role="2Oq$k0">
-                        <ref role="3cqZAo" node="4ziKDEn90jb" resolve="olderPackage" />
+                  <node concept="3fqX7Q" id="3egY5wRoIB3" role="3clFbw">
+                    <node concept="2OqwBi" id="3egY5wRoIB5" role="3fr31v">
+                      <node concept="37vLTw" id="3egY5wRruMx" role="2Oq$k0">
+                        <ref role="3cqZAo" node="3egY5wRruMt" resolve="crtXmlNewLine" />
                       </node>
-                      <node concept="liA8E" id="4ziKDEndzKc" role="2OqNvi">
-                        <ref role="37wK5l" to="5zxs:~WordprocessingMLPackage.getMainDocumentPart()" resolve="getMainDocumentPart" />
+                      <node concept="liA8E" id="3egY5wRoIB9" role="2OqNvi">
+                        <ref role="37wK5l" to="wyt6:~String.equals(java.lang.Object)" resolve="equals" />
+                        <node concept="37vLTw" id="3egY5wRrB_S" role="37wK5m">
+                          <ref role="3cqZAo" node="3egY5wRrB_O" resolve="crtXmlWitnessLine" />
+                        </node>
                       </node>
                     </node>
-                    <node concept="liA8E" id="4ziKDEndAKs" role="2OqNvi">
-                      <ref role="37wK5l" to="cpcb:~Base.getRelationshipsPart()" resolve="getRelationshipsPart" />
-                    </node>
                   </node>
                 </node>
               </node>
+              <node concept="3cpWsn" id="3egY5wRovk5" role="1Duv9x">
+                <property role="TrG5h" value="idx" />
+                <node concept="10Oyi0" id="3egY5wRovMH" role="1tU5fm" />
+                <node concept="3cmrfG" id="3egY5wRowyz" role="33vP2m">
+                  <property role="3cmrfH" value="0" />
+                </node>
+              </node>
+              <node concept="3eOVzh" id="3egY5wRozr6" role="1Dwp0S">
+                <node concept="37vLTw" id="3egY5wRo$pN" role="3uHU7w">
+                  <ref role="3cqZAo" node="3egY5wRoiML" resolve="minLen" />
+                </node>
+                <node concept="37vLTw" id="3egY5wRox5B" role="3uHU7B">
+                  <ref role="3cqZAo" node="3egY5wRovk5" resolve="idx" />
+                </node>
+              </node>
+              <node concept="3uNrnE" id="3egY5wRoA4j" role="1Dwrff">
+                <node concept="37vLTw" id="3egY5wRoA4l" role="2$L3a6">
+                  <ref role="3cqZAo" node="3egY5wRovk5" resolve="idx" />
+                </node>
+              </node>
             </node>
-            <node concept="3clFbF" id="4ziKDEndEbZ" role="3cqZAp">
-              <node concept="37vLTI" id="4ziKDEndEc1" role="3clFbG">
-                <node concept="2OqwBi" id="4ziKDEndCsf" role="37vLTx">
-                  <node concept="2OqwBi" id="4ziKDEndPTD" role="2Oq$k0">
-                    <node concept="37vLTw" id="4ziKDEndPy9" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4ziKDEndOcS" resolve="sw" />
+            <node concept="3clFbH" id="3egY5wRouOT" role="3cqZAp" />
+            <node concept="3clFbJ" id="3egY5wRr4W3" role="3cqZAp">
+              <node concept="3clFbS" id="3egY5wRr4W5" role="3clFbx">
+                <node concept="3clFbF" id="4WhNU8SF39C" role="3cqZAp">
+                  <node concept="2OqwBi" id="4WhNU8SF39_" role="3clFbG">
+                    <node concept="10M0yZ" id="4WhNU8SF39A" role="2Oq$k0">
+                      <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                      <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
                     </node>
-                    <node concept="liA8E" id="4ziKDEndQpL" role="2OqNvi">
-                      <ref role="37wK5l" to="guwi:~StringWriter.getBuffer()" resolve="getBuffer" />
+                    <node concept="liA8E" id="4WhNU8SF39B" role="2OqNvi">
+                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                      <node concept="Xl_RD" id="4WhNU8SF4mB" role="37wK5m">
+                        <property role="Xl_RC" value="newFile: " />
+                      </node>
                     </node>
                   </node>
-                  <node concept="liA8E" id="4ziKDEndCNv" role="2OqNvi">
-                    <ref role="37wK5l" to="wyt6:~StringBuffer.toString()" resolve="toString" />
+                </node>
+                <node concept="3clFbF" id="4WhNU8SF7PQ" role="3cqZAp">
+                  <node concept="2OqwBi" id="4WhNU8SF7PR" role="3clFbG">
+                    <node concept="10M0yZ" id="4WhNU8SF7PS" role="2Oq$k0">
+                      <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                      <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
+                    </node>
+                    <node concept="liA8E" id="4WhNU8SF7PT" role="2OqNvi">
+                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                      <node concept="Xl_RD" id="4WhNU8SF7PU" role="37wK5m">
+                        <property role="Xl_RC" value="&gt;&gt;&gt;&gt;&gt;" />
+                      </node>
+                    </node>
                   </node>
                 </node>
-                <node concept="37vLTw" id="4ziKDEndEc5" role="37vLTJ">
-                  <ref role="3cqZAo" node="4ziKDEn90jT" resolve="contentStr" />
+                <node concept="3clFbF" id="4WhNU8SFbl2" role="3cqZAp">
+                  <node concept="2OqwBi" id="4WhNU8SFbkZ" role="3clFbG">
+                    <node concept="10M0yZ" id="4WhNU8SFbl0" role="2Oq$k0">
+                      <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                      <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
+                    </node>
+                    <node concept="liA8E" id="4WhNU8SFbl1" role="2OqNvi">
+                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                      <node concept="37vLTw" id="4WhNU8SFcfv" role="37wK5m">
+                        <ref role="3cqZAo" node="4WhNU8SEtOC" resolve="xmlNew" />
+                      </node>
+                    </node>
+                  </node>
                 </node>
-              </node>
-            </node>
-            <node concept="1X3_iC" id="4ziKDEne9gi" role="lGtFl">
-              <property role="3V$3am" value="statement" />
-              <property role="3V$3ak" value="f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123136/1068581517665" />
-              <node concept="3clFbF" id="4ziKDEn90jX" role="8Wnug">
-                <node concept="2OqwBi" id="4ziKDEn913f" role="3clFbG">
-                  <node concept="10M0yZ" id="4ziKDEn913e" role="2Oq$k0">
-                    <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
-                    <ref role="3cqZAo" to="wyt6:~System.out" resolve="out" />
+                <node concept="3clFbF" id="4WhNU8SF8SN" role="3cqZAp">
+                  <node concept="2OqwBi" id="4WhNU8SF8SO" role="3clFbG">
+                    <node concept="10M0yZ" id="4WhNU8SF8SP" role="2Oq$k0">
+                      <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                      <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
+                    </node>
+                    <node concept="liA8E" id="4WhNU8SF8SQ" role="2OqNvi">
+                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                      <node concept="Xl_RD" id="4WhNU8SF8SR" role="37wK5m">
+                        <property role="Xl_RC" value="&lt;&lt;&lt;&lt;&lt;" />
+                      </node>
+                    </node>
                   </node>
-                  <node concept="liA8E" id="4ziKDEn913g" role="2OqNvi">
-                    <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
-                    <node concept="3cpWs3" id="4ziKDEn913h" role="37wK5m">
-                      <node concept="Xl_RD" id="4ziKDEn913i" role="3uHU7B">
-                        <property role="Xl_RC" value="Result: \n\n " />
+                </node>
+                <node concept="3clFbF" id="4WhNU8SFdeD" role="3cqZAp">
+                  <node concept="2OqwBi" id="4WhNU8SFdeE" role="3clFbG">
+                    <node concept="10M0yZ" id="4WhNU8SFdeF" role="2Oq$k0">
+                      <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                      <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
+                    </node>
+                    <node concept="liA8E" id="4WhNU8SFdeG" role="2OqNvi">
+                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                      <node concept="Xl_RD" id="4WhNU8SFdeH" role="37wK5m">
+                        <property role="Xl_RC" value="witnessFile: " />
                       </node>
-                      <node concept="37vLTw" id="4ziKDEn913j" role="3uHU7w">
-                        <ref role="3cqZAo" node="4ziKDEn90jT" resolve="contentStr" />
+                    </node>
+                  </node>
+                </node>
+                <node concept="3clFbF" id="4WhNU8SFdey" role="3cqZAp">
+                  <node concept="2OqwBi" id="4WhNU8SFdez" role="3clFbG">
+                    <node concept="10M0yZ" id="4WhNU8SFde$" role="2Oq$k0">
+                      <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                      <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
+                    </node>
+                    <node concept="liA8E" id="4WhNU8SFde_" role="2OqNvi">
+                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                      <node concept="Xl_RD" id="4WhNU8SFdeA" role="37wK5m">
+                        <property role="Xl_RC" value="&gt;&gt;&gt;&gt;&gt;" />
                       </node>
                     </node>
                   </node>
                 </node>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbH" id="4ziKDEneaeU" role="3cqZAp" />
-        <node concept="3cpWs8" id="4ziKDEneEhQ" role="3cqZAp">
-          <node concept="3cpWsn" id="4ziKDEneEhR" role="3cpWs9">
-            <property role="TrG5h" value="contentsAreIdentical" />
-            <node concept="10P_77" id="4ziKDEneCKI" role="1tU5fm" />
-            <node concept="3fqX7Q" id="4ziKDEneEhS" role="33vP2m">
-              <node concept="1eOMI4" id="4ziKDEneEhT" role="3fr31v">
-                <node concept="22lmx$" id="4ziKDEneEhU" role="1eOMHV">
-                  <node concept="2OqwBi" id="4ziKDEneEhV" role="3uHU7w">
-                    <node concept="37vLTw" id="4ziKDEneEhW" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4ziKDEn90jT" resolve="contentStr" />
-                    </node>
-                    <node concept="liA8E" id="4ziKDEneEhX" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
-                      <node concept="Xl_RD" id="4ziKDEneEhY" role="37wK5m">
-                        <property role="Xl_RC" value="w:del" />
+                <node concept="3clFbF" id="4WhNU8SFder" role="3cqZAp">
+                  <node concept="2OqwBi" id="4WhNU8SFdes" role="3clFbG">
+                    <node concept="10M0yZ" id="4WhNU8SFdet" role="2Oq$k0">
+                      <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                      <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
+                    </node>
+                    <node concept="liA8E" id="4WhNU8SFdeu" role="2OqNvi">
+                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                      <node concept="37vLTw" id="4WhNU8SFdev" role="37wK5m">
+                        <ref role="3cqZAo" node="4WhNU8SExaY" resolve="xmlWitness" />
                       </node>
                     </node>
                   </node>
-                  <node concept="2OqwBi" id="4ziKDEneEhZ" role="3uHU7B">
-                    <node concept="37vLTw" id="4ziKDEneEi0" role="2Oq$k0">
-                      <ref role="3cqZAo" node="4ziKDEn90jT" resolve="contentStr" />
-                    </node>
-                    <node concept="liA8E" id="4ziKDEneEi1" role="2OqNvi">
-                      <ref role="37wK5l" to="wyt6:~String.contains(java.lang.CharSequence)" resolve="contains" />
-                      <node concept="Xl_RD" id="4ziKDEneEi2" role="37wK5m">
-                        <property role="Xl_RC" value="w:ins" />
+                </node>
+                <node concept="3clFbF" id="4WhNU8SFdek" role="3cqZAp">
+                  <node concept="2OqwBi" id="4WhNU8SFdel" role="3clFbG">
+                    <node concept="10M0yZ" id="4WhNU8SFdem" role="2Oq$k0">
+                      <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
+                      <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
+                    </node>
+                    <node concept="liA8E" id="4WhNU8SFden" role="2OqNvi">
+                      <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
+                      <node concept="Xl_RD" id="4WhNU8SFdeo" role="37wK5m">
+                        <property role="Xl_RC" value="&lt;&lt;&lt;&lt;&lt;" />
                       </node>
                     </node>
                   </node>
                 </node>
               </node>
-            </node>
-          </node>
-        </node>
-        <node concept="3clFbJ" id="4ziKDEneFyz" role="3cqZAp">
-          <node concept="3clFbS" id="4ziKDEneFy_" role="3clFbx">
-            <node concept="3clFbF" id="4ziKDEneGhD" role="3cqZAp">
-              <node concept="2OqwBi" id="4ziKDEneGhA" role="3clFbG">
-                <node concept="10M0yZ" id="4ziKDEneGhB" role="2Oq$k0">
-                  <ref role="1PxDUh" to="wyt6:~System" resolve="System" />
-                  <ref role="3cqZAo" to="wyt6:~System.err" resolve="err" />
-                </node>
-                <node concept="liA8E" id="4ziKDEneGhC" role="2OqNvi">
-                  <ref role="37wK5l" to="guwi:~PrintStream.println(java.lang.String)" resolve="println" />
-                  <node concept="37vLTw" id="4ziKDEneGls" role="37wK5m">
-                    <ref role="3cqZAo" node="4ziKDEn90jT" resolve="contentStr" />
-                  </node>
+              <node concept="3fqX7Q" id="3egY5wRr6AG" role="3clFbw">
+                <node concept="37vLTw" id="3egY5wRr7U7" role="3fr31v">
+                  <ref role="3cqZAo" node="4WhNU8SEYbZ" resolve="res" />
                 </node>
               </node>
             </node>
-          </node>
-          <node concept="3fqX7Q" id="4ziKDEneFRe" role="3clFbw">
-            <node concept="37vLTw" id="4ziKDEneGen" role="3fr31v">
-              <ref role="3cqZAo" node="4ziKDEneEhR" resolve="contentsAreIdentical" />
+            <node concept="3cpWs6" id="4WhNU8SEGq2" role="3cqZAp">
+              <node concept="37vLTw" id="4WhNU8SEYc4" role="3cqZAk">
+                <ref role="3cqZAo" node="4WhNU8SEYbZ" resolve="res" />
+              </node>
             </node>
           </node>
         </node>
-        <node concept="3clFbH" id="4ziKDEneG_V" role="3cqZAp" />
-        <node concept="3clFbF" id="4ziKDEncYow" role="3cqZAp">
-          <node concept="37vLTw" id="4ziKDEneEi3" role="3clFbG">
-            <ref role="3cqZAo" node="4ziKDEneEhR" resolve="contentsAreIdentical" />
-          </node>
-        </node>
       </node>
       <node concept="10P_77" id="4ziKDEn8YG9" role="3clF45" />
       <node concept="37vLTG" id="4ziKDEn8ZKW" role="3clF46">
@@ -503,6 +682,12 @@
           <ref role="3uigEE" to="guwi:~File" resolve="File" />
         </node>
       </node>
+      <node concept="37vLTG" id="3egY5wRqwZw" role="3clF46">
+        <property role="TrG5h" value="prefixesOfLinesToIgnore" />
+        <node concept="2hMVRd" id="3egY5wRqAdx" role="1tU5fm">
+          <node concept="17QB3L" id="3egY5wRqAdz" role="2hN53Y" />
+        </node>
+      </node>
       <node concept="3Tm1VV" id="4ziKDEnfvdX" role="1B3o_S" />
     </node>
     <node concept="3Tm1VV" id="4ziKDEnfuVI" role="1B3o_S" />