diff --git a/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn b/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
index 5dfc1340..925bd728 100644
--- a/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
+++ b/execute-procure-to-pay/cc-invoice-approval-process/cc-invoice-approval-process-v2.bpmn
@@ -34,8 +34,6 @@
         <bpmn:flowNodeRef>Gateway_1lbghql</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_0x83ruk</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_0m3ri6v</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Event_0f3d2bp</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Gateway_1l4tz4i</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0gkejaj</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1ucvkk4</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_15y55nw</bpmn:flowNodeRef>
@@ -43,24 +41,26 @@
         <bpmn:flowNodeRef>Activity_0o1vc0a</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0p88elm</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_1717c0p</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Event_1b58a3z</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_0fq1nb4</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_0bvopx2</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_08koius</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>SubProcess_Data_validation_rules</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_show_errors</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0cfvsk7</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_1ftzr6x</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_0fsoa08</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_102t7tk</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_1lq96cy</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_12qepud</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_Invoice_is_accepted</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_1egoehb</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_1lq96cy</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_102t7tk</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0fq1nb4</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Gateway_1l4tz4i</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0fsoa08</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Event_1b58a3z</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_1ftzr6x</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Event_0f3d2bp</bpmn:flowNodeRef>
       </bpmn:lane>
       <bpmn:lane id="Lane_1so23vf" name="Finance Team">
-        <bpmn:flowNodeRef>Activity_0cdgqi0</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_16u0f7b</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0cdgqi0</bpmn:flowNodeRef>
       </bpmn:lane>
       <bpmn:lane id="Lane_1b7abal" name="Approver" />
     </bpmn:laneSet>
@@ -139,14 +139,6 @@
       <bpmn:incoming>Flow_1gohkts</bpmn:incoming>
       <bpmn:outgoing>Flow_0zy4869</bpmn:outgoing>
     </bpmn:intermediateThrowEvent>
-    <bpmn:endEvent id="Event_0f3d2bp" name="Invoice is declined">
-      <bpmn:incoming>Flow_1wturr2</bpmn:incoming>
-    </bpmn:endEvent>
-    <bpmn:exclusiveGateway id="Gateway_1l4tz4i" name="Approved?">
-      <bpmn:incoming>Flow_1m8oeg0</bpmn:incoming>
-      <bpmn:outgoing>Flow_18xvx8w</bpmn:outgoing>
-      <bpmn:outgoing>Flow_0bfs2xe</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
     <bpmn:subProcess id="Activity_0gkejaj" name="4. Compare Invoice data vs Enterprise systems data">
       <bpmn:incoming>Flow_1ex5hfx</bpmn:incoming>
       <bpmn:outgoing>Flow_1c5u447</bpmn:outgoing>
@@ -281,14 +273,6 @@
       <bpmn:incoming>Flow_1dtnpw3</bpmn:incoming>
       <bpmn:outgoing>Flow_1n7wssu</bpmn:outgoing>
     </bpmn:parallelGateway>
-    <bpmn:endEvent id="Event_1b58a3z" name="Invoice is declined">
-      <bpmn:incoming>Flow_0c0c9mw</bpmn:incoming>
-    </bpmn:endEvent>
-    <bpmn:serviceTask id="Activity_0fq1nb4" name="5. Create Invoice in Xero">
-      <bpmn:incoming>Flow_18xvx8w</bpmn:incoming>
-      <bpmn:incoming>Flow_0zy4869</bpmn:incoming>
-      <bpmn:outgoing>Flow_01cnc1i</bpmn:outgoing>
-    </bpmn:serviceTask>
     <bpmn:endEvent id="Event_0bvopx2" name="Temp End Event">
       <bpmn:incoming>Flow_0nhu0ew</bpmn:incoming>
     </bpmn:endEvent>
@@ -398,22 +382,6 @@ Please fix.
       <bpmn:incoming>Flow_1n7wssu</bpmn:incoming>
       <bpmn:outgoing>Flow_1l1n5j5</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:serviceTask id="Activity_1ftzr6x" name="4b. Notify CC via Waku&#10;&#34;invoice rejected&#34;">
-      <bpmn:incoming>Flow_0rqdcfk</bpmn:incoming>
-      <bpmn:outgoing>Flow_1wturr2</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:serviceTask id="Activity_0fsoa08" name="4c. Notify CC via Waku&#10;&#34;invoice rejected&#34;">
-      <bpmn:incoming>Flow_0bfs2xe</bpmn:incoming>
-      <bpmn:outgoing>Flow_0c0c9mw</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:serviceTask id="Activity_102t7tk" name="6. Notify CC via Waku&#10;&#34;invoice approved&#34;">
-      <bpmn:incoming>Flow_01cnc1i</bpmn:incoming>
-      <bpmn:outgoing>Flow_1an91fc</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:serviceTask id="Activity_1lq96cy" name="7. Notify CC via Waku&#10;&#34;invoice received and approved&#34;">
-      <bpmn:incoming>Flow_1an91fc</bpmn:incoming>
-      <bpmn:outgoing>Flow_0vkr4vr</bpmn:outgoing>
-    </bpmn:serviceTask>
     <bpmn:sequenceFlow id="Flow_0lc8yoi" sourceRef="Event_12qepud" targetRef="Gateway_16gxu6s" />
     <bpmn:startEvent id="Event_12qepud">
       <bpmn:outgoing>Flow_0lc8yoi</bpmn:outgoing>
@@ -426,12 +394,44 @@ Please fix.
     </bpmn:intermediateThrowEvent>
     <bpmn:dataObjectReference id="DataObjectReference_19srmyi" name="invoice" dataObjectRef="invoice" />
     <bpmn:dataObject id="invoice" />
+    <bpmn:endEvent id="Event_16u0f7b" name="Invoice is ready for payment">
+      <bpmn:incoming>Flow_0vd1pxu</bpmn:incoming>
+    </bpmn:endEvent>
     <bpmn:userTask id="Activity_0cdgqi0" name="Prepare payment">
       <bpmn:incoming>Flow_0vkr4vr</bpmn:incoming>
       <bpmn:outgoing>Flow_0vd1pxu</bpmn:outgoing>
     </bpmn:userTask>
-    <bpmn:endEvent id="Event_16u0f7b" name="Invoice is ready for payment">
-      <bpmn:incoming>Flow_0vd1pxu</bpmn:incoming>
+    <bpmn:serviceTask id="Activity_1lq96cy" name="7. Notify CC via Waku&#10;&#34;invoice received and approved&#34;">
+      <bpmn:incoming>Flow_1an91fc</bpmn:incoming>
+      <bpmn:outgoing>Flow_0vkr4vr</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:serviceTask id="Activity_102t7tk" name="6. Notify CC via Waku&#10;&#34;invoice approved&#34;">
+      <bpmn:incoming>Flow_01cnc1i</bpmn:incoming>
+      <bpmn:outgoing>Flow_1an91fc</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:serviceTask id="Activity_0fq1nb4" name="5. Create Invoice in Xero">
+      <bpmn:incoming>Flow_18xvx8w</bpmn:incoming>
+      <bpmn:incoming>Flow_0zy4869</bpmn:incoming>
+      <bpmn:outgoing>Flow_01cnc1i</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:exclusiveGateway id="Gateway_1l4tz4i" name="Approved?">
+      <bpmn:incoming>Flow_1m8oeg0</bpmn:incoming>
+      <bpmn:outgoing>Flow_18xvx8w</bpmn:outgoing>
+      <bpmn:outgoing>Flow_0bfs2xe</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:serviceTask id="Activity_0fsoa08" name="4c. Notify CC via Waku&#10;&#34;invoice rejected&#34;">
+      <bpmn:incoming>Flow_0bfs2xe</bpmn:incoming>
+      <bpmn:outgoing>Flow_0c0c9mw</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:endEvent id="Event_1b58a3z" name="Invoice is declined">
+      <bpmn:incoming>Flow_0c0c9mw</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:serviceTask id="Activity_1ftzr6x" name="4b. Notify CC via Waku&#10;&#34;invoice rejected&#34;">
+      <bpmn:incoming>Flow_0rqdcfk</bpmn:incoming>
+      <bpmn:outgoing>Flow_1wturr2</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:endEvent id="Event_0f3d2bp" name="Invoice is declined">
+      <bpmn:incoming>Flow_1wturr2</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:textAnnotation id="TextAnnotation_07oqnmr">
       <bpmn:text>Please check your invoice data</bpmn:text>
@@ -509,16 +509,40 @@ Please fix.
           <dc:Bounds x="2182" y="625" width="57" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0f3d2bp_di" bpmnElement="Event_0f3d2bp">
-        <dc:Bounds x="2581" y="472" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2555" y="515" width="90" height="14" />
-        </bpmndi:BPMNLabel>
+      <bpmndi:BPMNShape id="Activity_0xwniza_di" bpmnElement="Activity_0cdgqi0">
+        <dc:Bounds x="3190" y="990" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0latih8_di" bpmnElement="Activity_1lq96cy">
+        <dc:Bounds x="3190" y="560" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0q5d0ku_di" bpmnElement="Activity_102t7tk">
+        <dc:Bounds x="3050" y="560" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0ejn04g_di" bpmnElement="Activity_0fq1nb4">
+        <dc:Bounds x="2910" y="560" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_1l4tz4i_di" bpmnElement="Gateway_1l4tz4i" isMarkerVisible="true">
-        <dc:Bounds x="2664" y="387" width="50" height="50" />
+        <dc:Bounds x="2935" y="387" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2732" y="402" width="54" height="14" />
+          <dc:Bounds x="3004" y="402" width="53" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0kcw8l6_di" bpmnElement="Activity_0fsoa08">
+        <dc:Bounds x="2910" y="270" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1b58a3z_di" bpmnElement="Event_1b58a3z">
+        <dc:Bounds x="3052" y="292" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3048" y="335" width="46" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0dh2tfy_di" bpmnElement="Activity_1ftzr6x">
+        <dc:Bounds x="2670" y="460" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0f3d2bp_di" bpmnElement="Event_0f3d2bp">
+        <dc:Bounds x="2812" y="482" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2808" y="525" width="46" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1rn2mgi_di" bpmnElement="Activity_0gkejaj">
@@ -545,15 +569,6 @@ Please fix.
       <bpmndi:BPMNShape id="Gateway_05ztwup_di" bpmnElement="Gateway_1717c0p">
         <dc:Bounds x="1614" y="497" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1b58a3z_di" bpmnElement="Event_1b58a3z">
-        <dc:Bounds x="2809" y="292" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2783" y="335" width="90" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0ejn04g_di" bpmnElement="Activity_0fq1nb4">
-        <dc:Bounds x="2639" y="560" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0bvopx2_di" bpmnElement="Event_0bvopx2">
         <dc:Bounds x="1122" y="622" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -573,18 +588,6 @@ Please fix.
       <bpmndi:BPMNShape id="Activity_1jg5wtk_di" bpmnElement="Activity_0cfvsk7">
         <dc:Bounds x="1720" y="482" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0dh2tfy_di" bpmnElement="Activity_1ftzr6x">
-        <dc:Bounds x="2436" y="450" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0kcw8l6_di" bpmnElement="Activity_0fsoa08">
-        <dc:Bounds x="2639" y="270" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0q5d0ku_di" bpmnElement="Activity_102t7tk">
-        <dc:Bounds x="2828" y="560" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0latih8_di" bpmnElement="Activity_1lq96cy">
-        <dc:Bounds x="2989" y="560" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_1m2s5lx_di" bpmnElement="Event_12qepud">
         <dc:Bounds x="382" y="504" width="36" height="36" />
       </bpmndi:BPMNShape>
@@ -600,9 +603,6 @@ Please fix.
           <dc:Bounds x="783" y="731" width="35" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0xwniza_di" bpmnElement="Activity_0cdgqi0">
-        <dc:Bounds x="2989" y="990" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_16u0f7b_di" bpmnElement="Event_16u0f7b">
         <dc:Bounds x="3322" y="1012" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -645,15 +645,15 @@ Please fix.
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_18xvx8w_di" bpmnElement="Flow_18xvx8w">
-        <di:waypoint x="2689" y="437" />
-        <di:waypoint x="2689" y="560" />
+        <di:waypoint x="2960" y="437" />
+        <di:waypoint x="2960" y="560" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2695" y="496" width="18" height="14" />
+          <dc:Bounds x="2967" y="496" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1m8oeg0_di" bpmnElement="Flow_1m8oeg0">
         <di:waypoint x="2379" y="412" />
-        <di:waypoint x="2664" y="412" />
+        <di:waypoint x="2935" y="412" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_11b24we_di" bpmnElement="Flow_11b24we">
         <di:waypoint x="585" y="522" />
@@ -677,43 +677,43 @@ Please fix.
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0rqdcfk_di" bpmnElement="Flow_0rqdcfk">
         <di:waypoint x="2359" y="470" />
-        <di:waypoint x="2359" y="490" />
-        <di:waypoint x="2436" y="490" />
+        <di:waypoint x="2359" y="500" />
+        <di:waypoint x="2670" y="500" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1wturr2_di" bpmnElement="Flow_1wturr2">
-        <di:waypoint x="2536" y="490" />
-        <di:waypoint x="2581" y="490" />
+        <di:waypoint x="2770" y="500" />
+        <di:waypoint x="2812" y="500" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0bfs2xe_di" bpmnElement="Flow_0bfs2xe">
-        <di:waypoint x="2689" y="387" />
-        <di:waypoint x="2689" y="350" />
+        <di:waypoint x="2960" y="387" />
+        <di:waypoint x="2960" y="350" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2698" y="359" width="13" height="14" />
+          <dc:Bounds x="2969" y="359" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0c0c9mw_di" bpmnElement="Flow_0c0c9mw">
-        <di:waypoint x="2739" y="310" />
-        <di:waypoint x="2809" y="310" />
+        <di:waypoint x="3010" y="310" />
+        <di:waypoint x="3052" y="310" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0vd1pxu_di" bpmnElement="Flow_0vd1pxu">
-        <di:waypoint x="3089" y="1030" />
+        <di:waypoint x="3290" y="1030" />
         <di:waypoint x="3322" y="1030" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1an91fc_di" bpmnElement="Flow_1an91fc">
-        <di:waypoint x="2928" y="600" />
-        <di:waypoint x="2989" y="600" />
+        <di:waypoint x="3150" y="600" />
+        <di:waypoint x="3190" y="600" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0zy4869_di" bpmnElement="Flow_0zy4869">
         <di:waypoint x="2227" y="600" />
-        <di:waypoint x="2639" y="600" />
+        <di:waypoint x="2910" y="600" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_01cnc1i_di" bpmnElement="Flow_01cnc1i">
-        <di:waypoint x="2739" y="600" />
-        <di:waypoint x="2828" y="600" />
+        <di:waypoint x="3010" y="600" />
+        <di:waypoint x="3050" y="600" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0vkr4vr_di" bpmnElement="Flow_0vkr4vr">
-        <di:waypoint x="3039" y="640" />
-        <di:waypoint x="3039" y="990" />
+        <di:waypoint x="3240" y="640" />
+        <di:waypoint x="3240" y="990" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1n7wssu_di" bpmnElement="Flow_1n7wssu">
         <di:waypoint x="1664" y="522" />
@@ -780,7 +780,7 @@ Please fix.
         <dc:Bounds x="1476" y="1040" width="299" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Participant_0b27sri_di" bpmnElement="Participant_0b27sri" isHorizontal="true">
-        <dc:Bounds x="2534" y="1040" width="307" height="80" />
+        <dc:Bounds x="2805" y="1040" width="307" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="TextAnnotation_1uaw1w7_di" bpmnElement="TextAnnotation_1uaw1w7">
         <dc:Bounds x="490" y="-170" width="400" height="30" />
@@ -814,8 +814,8 @@ Please fix.
         <di:waypoint x="1760" y="150" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0p0bc5u_di" bpmnElement="Flow_0p0bc5u">
-        <di:waypoint x="2689" y="640" />
-        <di:waypoint x="2689" y="1040" />
+        <di:waypoint x="2960" y="640" />
+        <di:waypoint x="2960" y="1040" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0n9qxyw_di" bpmnElement="Flow_0n9qxyw">
         <di:waypoint x="680" y="482" />
@@ -825,16 +825,16 @@ Please fix.
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1getkzr_di" bpmnElement="Flow_1getkzr">
-        <di:waypoint x="2689" y="270" />
-        <di:waypoint x="2689" y="150" />
+        <di:waypoint x="2960" y="270" />
+        <di:waypoint x="2960" y="150" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0ozze4c_di" bpmnElement="Flow_0ozze4c">
-        <di:waypoint x="2486" y="450" />
-        <di:waypoint x="2486" y="150" />
+        <di:waypoint x="2720" y="460" />
+        <di:waypoint x="2720" y="150" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1dgkwzr_di" bpmnElement="Flow_1dgkwzr">
-        <di:waypoint x="2878" y="560" />
-        <di:waypoint x="2878" y="150" />
+        <di:waypoint x="3100" y="560" />
+        <di:waypoint x="3100" y="150" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
@@ -976,6 +976,18 @@ Please fix.
       <bpmndi:BPMNShape id="Gateway_1vl3ipe_di" bpmnElement="Gateway_1vl3ipe" isMarkerVisible="true">
         <dc:Bounds x="625" y="215" width="50" height="50" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="DataObjectReference_0bmx5fp_di" bpmnElement="DataObjectReference_0bmx5fp">
+        <dc:Bounds x="452" y="15" width="36" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="452" y="61" width="36" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="DataObjectReference_0frvqwx_di" bpmnElement="DataObjectReference_0frvqwx">
+        <dc:Bounds x="302" y="305" width="36" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="293" y="351" width="55" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0n6sfiu_di" bpmnElement="Event_0n6sfiu">
         <dc:Bounds x="722" y="222" width="36" height="36" />
       </bpmndi:BPMNShape>
@@ -987,6 +999,14 @@ Please fix.
         <di:waypoint x="295" y="240" />
         <di:waypoint x="360" y="240" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="DataInputAssociation_1j84o28_di" bpmnElement="DataInputAssociation_1j84o28">
+        <di:waypoint x="338" y="316" />
+        <di:waypoint x="384" y="280" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="DataInputAssociation_0d670py_di" bpmnElement="DataInputAssociation_0d670py">
+        <di:waypoint x="488" y="63" />
+        <di:waypoint x="509" y="90" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0kx6gsl_di" bpmnElement="Flow_0kx6gsl">
         <di:waypoint x="270" y="215" />
         <di:waypoint x="270" y="130" />
@@ -1001,26 +1021,6 @@ Please fix.
         <di:waypoint x="650" y="130" />
         <di:waypoint x="650" y="215" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="DataObjectReference_0bmx5fp_di" bpmnElement="DataObjectReference_0bmx5fp">
-        <dc:Bounds x="452" y="15" width="36" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="452" y="61" width="36" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="DataInputAssociation_0d670py_di" bpmnElement="DataInputAssociation_0d670py">
-        <di:waypoint x="488" y="63" />
-        <di:waypoint x="509" y="90" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="DataObjectReference_0frvqwx_di" bpmnElement="DataObjectReference_0frvqwx">
-        <dc:Bounds x="302" y="305" width="36" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="293" y="351" width="55" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="DataInputAssociation_1j84o28_di" bpmnElement="DataInputAssociation_1j84o28">
-        <di:waypoint x="338" y="316" />
-        <di:waypoint x="384" y="280" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0zkxpa1_di" bpmnElement="Flow_0zkxpa1">
         <di:waypoint x="675" y="240" />
         <di:waypoint x="722" y="240" />