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 fb9061e6..e2a3cf30 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
@@ -8,7 +8,6 @@
     <bpmn:participant id="Participant_0b27sri" name="Xero" />
     <bpmn:messageFlow id="Flow_0ppupld" sourceRef="Activity_0o1vc0a" targetRef="Participant_0a8arrz" />
     <bpmn:messageFlow id="Flow_0yfnc92" sourceRef="Activity_0p88elm" targetRef="Participant_1qabwrg" />
-    <bpmn:messageFlow id="Flow_0e6f26d" sourceRef="Activity_08koius" targetRef="Participant_1fsb6gv" />
     <bpmn:messageFlow id="Flow_0jciftq" sourceRef="Activity_0cfvsk7" targetRef="Participant_1fsb6gv" />
     <bpmn:messageFlow id="Flow_0p0bc5u" sourceRef="Activity_0fq1nb4" targetRef="Participant_0b27sri" />
     <bpmn:messageFlow id="Flow_0n9qxyw" sourceRef="Submit_the_invoice" targetRef="Participant_1fsb6gv" />
@@ -31,14 +30,15 @@
         <bpmn:flowNodeRef>Event_12qepud</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Submit_the_invoice</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_validation_successful_question_mark</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Event_invoice_validation_failed</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0p88elm</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0o1vc0a</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_104xpp8</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_1lbghql</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_0x83ruk</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_0m3ri6v</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_15y55nw</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_05ov5p5</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_1717c0p</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_08koius</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0cfvsk7</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_Invoice_is_accepted</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1lq96cy</bpmn:flowNodeRef>
@@ -49,15 +49,13 @@
         <bpmn:flowNodeRef>Event_1b58a3z</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1ftzr6x</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_0f3d2bp</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Event_0bvopx2</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>SubProcess_Data_validation_rules</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_show_errors</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0yrv2bc</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0gkejaj</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1ucvkk4</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Event_0bvopx2</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_0p88elm</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_0o1vc0a</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_104xpp8</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Event_invoice_validation_failed</bpmn:flowNodeRef>
       </bpmn:lane>
       <bpmn:lane id="Lane_1so23vf" name="Finance Team">
         <bpmn:flowNodeRef>Event_16u0f7b</bpmn:flowNodeRef>
@@ -126,11 +124,6 @@
       <bpmn:outgoing>Flow_1x4rtop</bpmn:outgoing>
       <bpmn:outgoing>Flow_05ffq52</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:intermediateThrowEvent id="Event_invoice_validation_failed" name="Invoice is failed">
-      <bpmn:documentation>Process milestone should update the process metadata field “milestone reached”</bpmn:documentation>
-      <bpmn:incoming>Flow_05ffq52</bpmn:incoming>
-      <bpmn:outgoing>Flow_13ng1f4</bpmn:outgoing>
-    </bpmn:intermediateThrowEvent>
     <bpmn:subProcess id="SubProcess_Data_validation_rules" name="2b. Data validation rules">
       <bpmn:incoming>Flow_02moyg7</bpmn:incoming>
       <bpmn:outgoing>Flow_1ck27i7</bpmn:outgoing>
@@ -233,6 +226,53 @@ Please fix.
       <bpmn:script>currency_enum_options = [{"value": "AUD", "label": "Australian Dollar (AUD)"}, {"value": "CAD", "label": "Canadian Dollar (CAD)"}, {"value": "EUR", "label": "Euro (EUR)"}, {"value": "GBP", "label": "Pound sterling (GBP)"}, {"value": "SGD", "label": "Singapore Dollar (SGD)"}, {"value": "CHF", "label": "Swiss Franc (CHF)"}, {"value": "USD", "label": "US Dollar (USD)"}]</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:dataObject id="DataObject_08fjad1" />
+    <bpmn:dataObject id="DataObject_08l7zz3" />
+    <bpmn:sequenceFlow id="Flow_12cqm3u" sourceRef="Gateway_05ov5p5" targetRef="Activity_104xpp8" />
+    <bpmn:sequenceFlow id="Flow_0l5nhy3" sourceRef="Activity_0p88elm" targetRef="Gateway_1717c0p" />
+    <bpmn:sequenceFlow id="Flow_0wuedtr" sourceRef="Event_Invoice_is_accepted" targetRef="Gateway_05ov5p5" />
+    <bpmn:sequenceFlow id="Flow_12wlind" sourceRef="Activity_104xpp8" targetRef="Activity_0p88elm" />
+    <bpmn:serviceTask id="Activity_0p88elm" name="2d. Upload Invoice PDF document" scriptFormat="python" script="invoice_name = invoice.contributorName + &#34;_&#34; + invoice.invoiceId">
+      <bpmn:extensionElements>
+        <spiffworkflow:serviceTaskOperator id="pdf/CreatePDFAndUploadToS3">
+          <spiffworkflow:parameters>
+            <spiffworkflow:parameter id="aws_object_name" type="str" value="invoice_file_name" />
+            <spiffworkflow:parameter id="template" type="str" value="&#39;file:execute-procure-to-pay/cc-invoice-approval-process/invoice_template.md&#39;" />
+          </spiffworkflow:parameters>
+        </spiffworkflow:serviceTaskOperator>
+        <spiffworkflow:preScript />
+        <spiffworkflow:postScript />
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_12wlind</bpmn:incoming>
+      <bpmn:outgoing>Flow_0l5nhy3</bpmn:outgoing>
+      <bpmn:property id="Property_0gwue2n" name="__targetRef_placeholder" />
+      <bpmn:dataInputAssociation id="DataInputAssociation_0myc5qf">
+        <bpmn:sourceRef>DataObjectReference_07aj1tf</bpmn:sourceRef>
+        <bpmn:targetRef>Property_0gwue2n</bpmn:targetRef>
+      </bpmn:dataInputAssociation>
+    </bpmn:serviceTask>
+    <bpmn:serviceTask id="Activity_0o1vc0a" name="2c. Save Invoice Data">
+      <bpmn:extensionElements>
+        <spiffworkflow:serviceTaskOperator id="aws/AddDynamoItem" resultVariable="responseAddDynamoInvoice">
+          <spiffworkflow:parameters>
+            <spiffworkflow:parameter id="item_data" type="str" value="{ &#34;ContributorName&#34;: invoice.contributorName, &#34;ContributorId&#34;: invoice.contributorId, &#34;InvoiceId&#34;: invoice.invoiceId, &#34;InvoiceAmount&#34;: invoice.invoiceAmount, &#34;InvoiceCurrency&#34;: invoice.invoiceCurrency, &#34;DueDate&#34;: invoice.dueDate }" />
+            <spiffworkflow:parameter id="table_name" type="str" value="Invoices" />
+          </spiffworkflow:parameters>
+        </spiffworkflow:serviceTaskOperator>
+      </bpmn:extensionElements>
+    </bpmn:serviceTask>
+    <bpmn:dataObjectReference id="DataObjectReference_07aj1tf" name="invoice" dataObjectRef="invoice" />
+    <bpmn:scriptTask id="Activity_104xpp8" name="Temp">
+      <bpmn:incoming>Flow_12cqm3u</bpmn:incoming>
+      <bpmn:outgoing>Flow_12wlind</bpmn:outgoing>
+      <bpmn:property id="Property_09mkxyl" name="__targetRef_placeholder" />
+      <bpmn:dataInputAssociation id="DataInputAssociation_1s1efok">
+        <bpmn:sourceRef>DataObjectReference_0r84rok</bpmn:sourceRef>
+        <bpmn:targetRef>Property_09mkxyl</bpmn:targetRef>
+      </bpmn:dataInputAssociation>
+      <bpmn:script>invoice_file_name = invoice.contributorName + "_" + str(invoice.invoiceId) + ".pdf"</bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:dataObjectReference id="DataObjectReference_0r84rok" name="invoice" dataObjectRef="invoice" />
+    <bpmn:dataObject id="invoice" />
     <bpmn:exclusiveGateway id="Gateway_1lbghql" name="match?">
       <bpmn:incoming>Flow_1c5u447</bpmn:incoming>
       <bpmn:outgoing>Flow_1gohkts</bpmn:outgoing>
@@ -246,6 +286,76 @@ Please fix.
       <bpmn:incoming>Flow_1gohkts</bpmn:incoming>
       <bpmn:outgoing>Flow_0zy4869</bpmn:outgoing>
     </bpmn:intermediateThrowEvent>
+    <bpmn:intermediateThrowEvent id="Event_15y55nw" name="Invoice is submitted">
+      <bpmn:documentation>Process milestone should update the process metadata field “milestone reached”</bpmn:documentation>
+      <bpmn:incoming>Flow_1l1n5j5</bpmn:incoming>
+      <bpmn:outgoing>Flow_1ex5hfx</bpmn:outgoing>
+    </bpmn:intermediateThrowEvent>
+    <bpmn:parallelGateway id="Gateway_05ov5p5">
+      <bpmn:incoming>Flow_0wuedtr</bpmn:incoming>
+      <bpmn:outgoing>Flow_1i8r773</bpmn:outgoing>
+      <bpmn:outgoing>Flow_12cqm3u</bpmn:outgoing>
+    </bpmn:parallelGateway>
+    <bpmn:parallelGateway id="Gateway_1717c0p">
+      <bpmn:incoming>Flow_0l5nhy3</bpmn:incoming>
+      <bpmn:incoming>Flow_1i8r773</bpmn:incoming>
+      <bpmn:outgoing>Flow_1n7wssu</bpmn:outgoing>
+    </bpmn:parallelGateway>
+    <bpmn:serviceTask id="Activity_0cfvsk7" name="3. Notify CC via Waku&#10;&#34;invoice uploaded&#34;">
+      <bpmn:outgoing>Flow_1l1n5j5</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:intermediateThrowEvent id="Event_Invoice_is_accepted" name="Invoice is accepted">
+      <bpmn:documentation>Process milestone should update the process metadata field “milestone reached”</bpmn:documentation>
+      <bpmn:incoming>Flow_1x4rtop</bpmn:incoming>
+      <bpmn:outgoing>Flow_0wuedtr</bpmn:outgoing>
+      <bpmn:messageEventDefinition id="MessageEventDefinition_0uo5shi" messageRef="Message_Submit_Invoice" />
+    </bpmn:intermediateThrowEvent>
+    <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: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_0yvmfqu</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:manualTask id="Activity_06b32ar" name="Approve invocie manually">
+      <bpmn:incoming>Flow_1m8oeg0</bpmn:incoming>
+      <bpmn:outgoing>Flow_0yvmfqu</bpmn:outgoing>
+    </bpmn:manualTask>
+    <bpmn:serviceTask id="Activity_1ftzr6x" name="4b. Notify CC via Waku&#10;&#34;invoice rejected&#34;">
+      <bpmn:incoming>Flow_1v8dszb</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:endEvent id="Event_0bvopx2" name="Temp End Event">
+      <bpmn:incoming>Flow_1n7wssu</bpmn:incoming>
+    </bpmn:endEvent>
     <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>
@@ -358,132 +468,15 @@ Please fix.
       </bpmn:endEvent>
       <bpmn:sequenceFlow id="Flow_0zkxpa1" sourceRef="Gateway_1vl3ipe" targetRef="Event_0n6sfiu" />
     </bpmn:subProcess>
-    <bpmn:intermediateThrowEvent id="Event_15y55nw" name="Invoice is submitted">
-      <bpmn:documentation>Process milestone should update the process metadata field “milestone reached”</bpmn:documentation>
-      <bpmn:incoming>Flow_1l1n5j5</bpmn:incoming>
-      <bpmn:outgoing>Flow_1ex5hfx</bpmn:outgoing>
-    </bpmn:intermediateThrowEvent>
-    <bpmn:parallelGateway id="Gateway_05ov5p5">
-      <bpmn:incoming>Flow_0wuedtr</bpmn:incoming>
-      <bpmn:outgoing>Flow_1i8r773</bpmn:outgoing>
-      <bpmn:outgoing>Flow_12cqm3u</bpmn:outgoing>
-    </bpmn:parallelGateway>
-    <bpmn:parallelGateway id="Gateway_1717c0p">
-      <bpmn:incoming>Flow_0l5nhy3</bpmn:incoming>
-      <bpmn:incoming>Flow_1i8r773</bpmn:incoming>
-      <bpmn:outgoing>Flow_1n7wssu</bpmn:outgoing>
-    </bpmn:parallelGateway>
-    <bpmn:sendTask id="Activity_08koius" name="Send the Error to front-end" messageRef="Message_Submit_Invoice" />
-    <bpmn:serviceTask id="Activity_0cfvsk7" name="3. Notify CC via Waku&#10;&#34;invoice uploaded&#34;">
-      <bpmn:outgoing>Flow_1l1n5j5</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:intermediateThrowEvent id="Event_Invoice_is_accepted" name="Invoice is accepted">
-      <bpmn:documentation>Process milestone should update the process metadata field “milestone reached”</bpmn:documentation>
-      <bpmn:incoming>Flow_1x4rtop</bpmn:incoming>
-      <bpmn:outgoing>Flow_0wuedtr</bpmn:outgoing>
-      <bpmn:messageEventDefinition id="MessageEventDefinition_0uo5shi" messageRef="Message_Submit_Invoice" />
-    </bpmn:intermediateThrowEvent>
-    <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: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_0yvmfqu</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:manualTask id="Activity_06b32ar" name="Approve invocie manually">
-      <bpmn:incoming>Flow_1m8oeg0</bpmn:incoming>
-      <bpmn:outgoing>Flow_0yvmfqu</bpmn:outgoing>
-    </bpmn:manualTask>
-    <bpmn:serviceTask id="Activity_1ftzr6x" name="4b. Notify CC via Waku&#10;&#34;invoice rejected&#34;">
-      <bpmn:incoming>Flow_1v8dszb</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:boundaryEvent id="Event_09q0ym0" name="3 days" cancelActivity="false" attachedToRef="Activity_06b32ar">
       <bpmn:outgoing>Flow_1v8dszb</bpmn:outgoing>
       <bpmn:timerEventDefinition id="TimerEventDefinition_0y2jolb" />
     </bpmn:boundaryEvent>
-    <bpmn:dataObject id="DataObject_08l7zz3" />
-    <bpmn:endEvent id="Event_0bvopx2" name="Temp End Event">
-      <bpmn:incoming>Flow_1n7wssu</bpmn:incoming>
-    </bpmn:endEvent>
-    <bpmn:sequenceFlow id="Flow_12cqm3u" sourceRef="Gateway_05ov5p5" targetRef="Activity_104xpp8" />
-    <bpmn:sequenceFlow id="Flow_0l5nhy3" sourceRef="Activity_0p88elm" targetRef="Gateway_1717c0p" />
-    <bpmn:sequenceFlow id="Flow_0wuedtr" sourceRef="Event_Invoice_is_accepted" targetRef="Gateway_05ov5p5" />
-    <bpmn:serviceTask id="Activity_0p88elm" name="2d. Upload Invoice PDF document" scriptFormat="python" script="invoice_name = invoice.contributorName + &#34;_&#34; + invoice.invoiceId">
-      <bpmn:extensionElements>
-        <spiffworkflow:serviceTaskOperator id="pdf/CreatePDFAndUploadToS3">
-          <spiffworkflow:parameters>
-            <spiffworkflow:parameter id="aws_object_name" type="str" value="invoice_file_name" />
-            <spiffworkflow:parameter id="template" type="str" value="&#39;file:execute-procure-to-pay/cc-invoice-approval-process/invoice_template.md&#39;" />
-          </spiffworkflow:parameters>
-        </spiffworkflow:serviceTaskOperator>
-        <spiffworkflow:preScript />
-        <spiffworkflow:postScript />
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_12wlind</bpmn:incoming>
-      <bpmn:outgoing>Flow_0l5nhy3</bpmn:outgoing>
-      <bpmn:property id="Property_0gwue2n" name="__targetRef_placeholder" />
-      <bpmn:dataInputAssociation id="DataInputAssociation_0myc5qf">
-        <bpmn:sourceRef>DataObjectReference_07aj1tf</bpmn:sourceRef>
-        <bpmn:targetRef>Property_0gwue2n</bpmn:targetRef>
-      </bpmn:dataInputAssociation>
-    </bpmn:serviceTask>
-    <bpmn:serviceTask id="Activity_0o1vc0a" name="2c. Save Invoice Data">
-      <bpmn:extensionElements>
-        <spiffworkflow:serviceTaskOperator id="aws/AddDynamoItem" resultVariable="responseAddDynamoInvoice">
-          <spiffworkflow:parameters>
-            <spiffworkflow:parameter id="item_data" type="str" value="{ &#34;ContributorName&#34;: invoice.contributorName, &#34;ContributorId&#34;: invoice.contributorId, &#34;InvoiceId&#34;: invoice.invoiceId, &#34;InvoiceAmount&#34;: invoice.invoiceAmount, &#34;InvoiceCurrency&#34;: invoice.invoiceCurrency, &#34;DueDate&#34;: invoice.dueDate }" />
-            <spiffworkflow:parameter id="table_name" type="str" value="Invoices" />
-          </spiffworkflow:parameters>
-        </spiffworkflow:serviceTaskOperator>
-      </bpmn:extensionElements>
-    </bpmn:serviceTask>
-    <bpmn:dataObjectReference id="DataObjectReference_07aj1tf" name="invoice" dataObjectRef="invoice" />
-    <bpmn:scriptTask id="Activity_104xpp8" name="Temp">
-      <bpmn:incoming>Flow_12cqm3u</bpmn:incoming>
-      <bpmn:outgoing>Flow_12wlind</bpmn:outgoing>
-      <bpmn:property id="Property_09mkxyl" name="__targetRef_placeholder" />
-      <bpmn:dataInputAssociation id="DataInputAssociation_1s1efok">
-        <bpmn:sourceRef>DataObjectReference_0r84rok</bpmn:sourceRef>
-        <bpmn:targetRef>Property_09mkxyl</bpmn:targetRef>
-      </bpmn:dataInputAssociation>
-      <bpmn:script>invoice_file_name = invoice.contributorName + "_" + str(invoice.invoiceId) + ".pdf"</bpmn:script>
-    </bpmn:scriptTask>
-    <bpmn:sequenceFlow id="Flow_12wlind" sourceRef="Activity_104xpp8" targetRef="Activity_0p88elm" />
-    <bpmn:dataObjectReference id="DataObjectReference_0r84rok" name="invoice" dataObjectRef="invoice" />
-    <bpmn:dataObject id="invoice" />
-    <bpmn:textAnnotation id="TextAnnotation_07oqnmr">
-      <bpmn:text>Please check your invoice data</bpmn:text>
-    </bpmn:textAnnotation>
-    <bpmn:association id="Association_170uhu5" sourceRef="Activity_08koius" targetRef="TextAnnotation_07oqnmr" />
+    <bpmn:intermediateThrowEvent id="Event_invoice_validation_failed" name="Invoice is failed">
+      <bpmn:documentation>Process milestone should update the process metadata field “milestone reached”</bpmn:documentation>
+      <bpmn:incoming>Flow_05ffq52</bpmn:incoming>
+      <bpmn:outgoing>Flow_13ng1f4</bpmn:outgoing>
+    </bpmn:intermediateThrowEvent>
   </bpmn:process>
   <bpmn:process id="Process_cc_invoice_approval_process_v2_c" isExecutable="false" />
   <bpmn:process id="Process_cc_invoice_approval_process_v2_d" isExecutable="false" />
@@ -504,20 +497,20 @@ Please fix.
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_130jph2">
       <bpmndi:BPMNShape id="Participant_1fsb6gv_di" bpmnElement="Participant_1fsb6gv" isHorizontal="true">
-        <dc:Bounds x="280" y="-70" width="3540" height="220" />
+        <dc:Bounds x="280" y="-70" width="3340" height="220" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Participant_11ab2hx_di" bpmnElement="Participant_11ab2hx" isHorizontal="true">
-        <dc:Bounds x="280" y="210" width="3540" height="920" />
+        <dc:Bounds x="280" y="210" width="3340" height="920" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Lane_1b7abal_di" bpmnElement="Lane_1b7abal" isHorizontal="true">
-        <dc:Bounds x="310" y="800" width="3510" height="160" />
+        <dc:Bounds x="310" y="800" width="3310" height="160" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Lane_1so23vf_di" bpmnElement="Lane_1so23vf" isHorizontal="true">
-        <dc:Bounds x="310" y="960" width="3510" height="170" />
+        <dc:Bounds x="310" y="960" width="3310" height="170" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Lane_1a0qu8e_di" bpmnElement="Lane_1a0qu8e" isHorizontal="true">
-        <dc:Bounds x="310" y="210" width="3510" height="590" />
+        <dc:Bounds x="310" y="210" width="3310" height="590" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_16gxu6s_di" bpmnElement="Gateway_16gxu6s" isMarkerVisible="true">
@@ -535,31 +528,122 @@ Please fix.
           <dc:Bounds x="1190" y="557" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0svbvjn_di" bpmnElement="Event_invoice_validation_failed">
-        <dc:Bounds x="1202" y="422" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1116" y="433" width="76" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0zssftc_di" bpmnElement="Activity_0p88elm">
-        <dc:Bounds x="1880" y="560" width="100" height="80" />
+        <dc:Bounds x="1680" y="560" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_076kb81_di" bpmnElement="Activity_0o1vc0a">
-        <dc:Bounds x="1750" y="422" width="100" height="80" />
+        <dc:Bounds x="1550" y="422" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="DataObjectReference_07aj1tf_di" bpmnElement="DataObjectReference_07aj1tf">
-        <dc:Bounds x="1842" y="685" width="36" height="50" />
+        <dc:Bounds x="1642" y="685" width="36" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1842" y="731" width="35" height="14" />
+          <dc:Bounds x="1642" y="731" width="35" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0bgyf4i_di" bpmnElement="Activity_104xpp8">
-        <dc:Bounds x="1670" y="560" width="100" height="80" />
+        <dc:Bounds x="1470" y="560" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="DataObjectReference_0r84rok_di" bpmnElement="DataObjectReference_0r84rok">
-        <dc:Bounds x="1632" y="675" width="36" height="50" />
+        <dc:Bounds x="1432" y="675" width="36" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1633" y="721" width="35" height="14" />
+          <dc:Bounds x="1433" y="721" width="35" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1lbghql_di" bpmnElement="Gateway_1lbghql" isMarkerVisible="true">
+        <dc:Bounds x="2324" y="497" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2380" y="513" width="37" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0x83ruk_di" bpmnElement="Event_0x83ruk">
+        <dc:Bounds x="2381" y="394" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2359" y="358" width="81" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0m3ri6v_di" bpmnElement="Event_0m3ri6v">
+        <dc:Bounds x="2381" y="582" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2372" y="625" width="57" height="40" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_15y55nw_di" bpmnElement="Event_15y55nw">
+        <dc:Bounds x="2051" y="504" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2045" y="547" width="48" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_10gbs8m_di" bpmnElement="Gateway_05ov5p5">
+        <dc:Bounds x="1405" y="497" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_05ztwup_di" bpmnElement="Gateway_1717c0p">
+        <dc:Bounds x="1804" y="497" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1jg5wtk_di" bpmnElement="Activity_0cfvsk7">
+        <dc:Bounds x="1910" y="482" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1lluywm_di" bpmnElement="Event_Invoice_is_accepted">
+        <dc:Bounds x="1312" y="504" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1307" y="467" width="46" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_16u0f7b_di" bpmnElement="Event_16u0f7b">
+        <dc:Bounds x="3512" y="1012" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3492" y="1056" width="77" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0xwniza_di" bpmnElement="Activity_0cdgqi0">
+        <dc:Bounds x="3380" y="990" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0latih8_di" bpmnElement="Activity_1lq96cy">
+        <dc:Bounds x="3380" y="560" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0q5d0ku_di" bpmnElement="Activity_102t7tk">
+        <dc:Bounds x="3240" y="560" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0ejn04g_di" bpmnElement="Activity_0fq1nb4">
+        <dc:Bounds x="3100" y="560" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1l4tz4i_di" bpmnElement="Gateway_1l4tz4i" isMarkerVisible="true">
+        <dc:Bounds x="3125" y="387" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3185" y="405" width="54" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0kcw8l6_di" bpmnElement="Activity_0fsoa08">
+        <dc:Bounds x="3100" y="270" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1b58a3z_di" bpmnElement="Event_1b58a3z">
+        <dc:Bounds x="3242" y="292" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3216" y="335" width="90" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0gj0xhy_di" bpmnElement="Activity_06b32ar">
+        <dc:Bounds x="2640" y="820" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0dh2tfy_di" bpmnElement="Activity_1ftzr6x">
+        <dc:Bounds x="2750" y="470" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0f3d2bp_di" bpmnElement="Event_0f3d2bp">
+        <dc:Bounds x="2882" y="492" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2856" y="535" width="90" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0bvopx2_di" bpmnElement="Event_0bvopx2">
+        <dc:Bounds x="1862" y="662" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1843" y="705" width="81" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0svbvjn_di" bpmnElement="Event_invoice_validation_failed">
+        <dc:Bounds x="1202" y="412" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1116" y="423" width="76" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0z13hw3_di" bpmnElement="SubProcess_Data_validation_rules">
@@ -578,224 +662,127 @@ Please fix.
       <bpmndi:BPMNShape id="Activity_0twut50_di" bpmnElement="Activity_0yrv2bc">
         <dc:Bounds x="660" y="482" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_1lbghql_di" bpmnElement="Gateway_1lbghql" isMarkerVisible="true">
-        <dc:Bounds x="2524" y="497" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2580" y="513" width="37" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0x83ruk_di" bpmnElement="Event_0x83ruk">
-        <dc:Bounds x="2581" y="394" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2559" y="358" width="81" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0m3ri6v_di" bpmnElement="Event_0m3ri6v">
-        <dc:Bounds x="2581" y="582" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2572" y="625" width="57" height="40" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1rn2mgi_di" bpmnElement="Activity_0gkejaj">
-        <dc:Bounds x="2369" y="482" width="100" height="80" />
+        <dc:Bounds x="2169" y="482" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0j807g0_di" bpmnElement="Activity_1ucvkk4">
-        <dc:Bounds x="2669" y="372" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_15y55nw_di" bpmnElement="Event_15y55nw">
-        <dc:Bounds x="2251" y="504" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2245" y="547" width="48" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_10gbs8m_di" bpmnElement="Gateway_05ov5p5">
-        <dc:Bounds x="1605" y="497" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_05ztwup_di" bpmnElement="Gateway_1717c0p">
-        <dc:Bounds x="2004" y="497" width="50" height="50" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0qaxjv6_di" bpmnElement="Activity_08koius">
-        <dc:Bounds x="1500" y="306" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1jg5wtk_di" bpmnElement="Activity_0cfvsk7">
-        <dc:Bounds x="2110" y="482" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1lluywm_di" bpmnElement="Event_Invoice_is_accepted">
-        <dc:Bounds x="1512" y="504" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1507" y="467" width="46" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_16u0f7b_di" bpmnElement="Event_16u0f7b">
-        <dc:Bounds x="3712" y="1012" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3692" y="1056" width="77" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0xwniza_di" bpmnElement="Activity_0cdgqi0">
-        <dc:Bounds x="3580" y="990" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0latih8_di" bpmnElement="Activity_1lq96cy">
-        <dc:Bounds x="3580" y="560" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0q5d0ku_di" bpmnElement="Activity_102t7tk">
-        <dc:Bounds x="3440" y="560" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0ejn04g_di" bpmnElement="Activity_0fq1nb4">
-        <dc:Bounds x="3300" y="560" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_1l4tz4i_di" bpmnElement="Gateway_1l4tz4i" isMarkerVisible="true">
-        <dc:Bounds x="3325" y="387" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3394" y="402" width="54" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0kcw8l6_di" bpmnElement="Activity_0fsoa08">
-        <dc:Bounds x="3300" y="270" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1b58a3z_di" bpmnElement="Event_1b58a3z">
-        <dc:Bounds x="3442" y="292" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3416" y="335" width="90" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0gj0xhy_di" bpmnElement="Activity_06b32ar">
-        <dc:Bounds x="2840" y="820" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0dh2tfy_di" bpmnElement="Activity_1ftzr6x">
-        <dc:Bounds x="2950" y="470" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0f3d2bp_di" bpmnElement="Event_0f3d2bp">
-        <dc:Bounds x="3082" y="492" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3056" y="535" width="90" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0bvopx2_di" bpmnElement="Event_0bvopx2">
-        <dc:Bounds x="2062" y="662" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2043" y="705" width="81" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="TextAnnotation_07oqnmr_di" bpmnElement="TextAnnotation_07oqnmr">
-        <dc:Bounds x="1480" y="220" width="100" height="54" />
+        <dc:Bounds x="2469" y="372" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_1n1umf8_di" bpmnElement="Event_09q0ym0">
-        <dc:Bounds x="2902" y="882" width="36" height="36" />
+        <dc:Bounds x="2702" y="882" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2904" y="925" width="33" height="14" />
+          <dc:Bounds x="2704" y="925" width="33" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_1x4rtop_di" bpmnElement="Flow_1x4rtop">
         <di:waypoint x="1245" y="522" />
-        <di:waypoint x="1512" y="522" />
+        <di:waypoint x="1312" y="522" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1284" y="498" width="18" height="14" />
+          <dc:Bounds x="1261" y="498" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_05ffq52_di" bpmnElement="Flow_05ffq52">
         <di:waypoint x="1220" y="497" />
-        <di:waypoint x="1220" y="458" />
+        <di:waypoint x="1220" y="448" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1228" y="478" width="15" height="14" />
+          <dc:Bounds x="1228" y="475" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1c5u447_di" bpmnElement="Flow_1c5u447">
-        <di:waypoint x="2469" y="522" />
-        <di:waypoint x="2524" y="522" />
+        <di:waypoint x="2269" y="522" />
+        <di:waypoint x="2324" y="522" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1gohkts_di" bpmnElement="Flow_1gohkts">
-        <di:waypoint x="2549" y="547" />
-        <di:waypoint x="2549" y="600" />
-        <di:waypoint x="2581" y="600" />
+        <di:waypoint x="2349" y="547" />
+        <di:waypoint x="2349" y="600" />
+        <di:waypoint x="2381" y="600" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2556" y="570" width="18" height="14" />
+          <dc:Bounds x="2356" y="570" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_18xvx8w_di" bpmnElement="Flow_18xvx8w">
-        <di:waypoint x="3350" y="437" />
-        <di:waypoint x="3350" y="560" />
+        <di:waypoint x="3150" y="437" />
+        <di:waypoint x="3150" y="560" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="3357" y="496" width="18" height="14" />
+          <dc:Bounds x="3157" y="496" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1m8oeg0_di" bpmnElement="Flow_1m8oeg0">
-        <di:waypoint x="2769" y="412" />
-        <di:waypoint x="2805" y="412" />
-        <di:waypoint x="2805" y="860" />
-        <di:waypoint x="2840" y="860" />
+        <di:waypoint x="2569" y="412" />
+        <di:waypoint x="2605" y="412" />
+        <di:waypoint x="2605" y="860" />
+        <di:waypoint x="2640" y="860" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_11b24we_di" bpmnElement="Flow_11b24we">
         <di:waypoint x="585" y="522" />
         <di:waypoint x="660" y="522" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1ex5hfx_di" bpmnElement="Flow_1ex5hfx">
-        <di:waypoint x="2287" y="522" />
-        <di:waypoint x="2369" y="522" />
+        <di:waypoint x="2087" y="522" />
+        <di:waypoint x="2169" y="522" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_16bw9hx_di" bpmnElement="Flow_16bw9hx">
-        <di:waypoint x="2549" y="497" />
-        <di:waypoint x="2549" y="412" />
-        <di:waypoint x="2581" y="412" />
+        <di:waypoint x="2349" y="497" />
+        <di:waypoint x="2349" y="412" />
+        <di:waypoint x="2381" y="412" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2557" y="454" width="15" height="14" />
+          <dc:Bounds x="2357" y="454" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_138hkfx_di" bpmnElement="Flow_138hkfx">
-        <di:waypoint x="2617" y="412" />
-        <di:waypoint x="2669" y="412" />
+        <di:waypoint x="2417" y="412" />
+        <di:waypoint x="2469" y="412" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1wturr2_di" bpmnElement="Flow_1wturr2">
-        <di:waypoint x="3050" y="510" />
-        <di:waypoint x="3082" y="510" />
+        <di:waypoint x="2850" y="510" />
+        <di:waypoint x="2882" y="510" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0bfs2xe_di" bpmnElement="Flow_0bfs2xe">
-        <di:waypoint x="3350" y="387" />
-        <di:waypoint x="3350" y="350" />
+        <di:waypoint x="3150" y="387" />
+        <di:waypoint x="3150" y="350" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="3359" y="359" width="13" height="14" />
+          <dc:Bounds x="3159" y="359" width="13" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0c0c9mw_di" bpmnElement="Flow_0c0c9mw">
-        <di:waypoint x="3400" y="310" />
-        <di:waypoint x="3442" y="310" />
+        <di:waypoint x="3200" y="310" />
+        <di:waypoint x="3242" y="310" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0vd1pxu_di" bpmnElement="Flow_0vd1pxu">
-        <di:waypoint x="3680" y="1030" />
-        <di:waypoint x="3712" y="1030" />
+        <di:waypoint x="3480" y="1030" />
+        <di:waypoint x="3512" y="1030" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1an91fc_di" bpmnElement="Flow_1an91fc">
-        <di:waypoint x="3540" y="600" />
-        <di:waypoint x="3580" y="600" />
+        <di:waypoint x="3340" y="600" />
+        <di:waypoint x="3380" y="600" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0zy4869_di" bpmnElement="Flow_0zy4869">
-        <di:waypoint x="2617" y="600" />
-        <di:waypoint x="3300" y="600" />
+        <di:waypoint x="2417" y="600" />
+        <di:waypoint x="3100" y="600" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_01cnc1i_di" bpmnElement="Flow_01cnc1i">
-        <di:waypoint x="3400" y="600" />
-        <di:waypoint x="3440" y="600" />
+        <di:waypoint x="3200" y="600" />
+        <di:waypoint x="3240" y="600" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0vkr4vr_di" bpmnElement="Flow_0vkr4vr">
-        <di:waypoint x="3630" y="640" />
-        <di:waypoint x="3630" y="990" />
+        <di:waypoint x="3430" y="640" />
+        <di:waypoint x="3430" y="990" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1n7wssu_di" bpmnElement="Flow_1n7wssu">
-        <di:waypoint x="2054" y="522" />
-        <di:waypoint x="2080" y="522" />
-        <di:waypoint x="2080" y="662" />
+        <di:waypoint x="1854" y="522" />
+        <di:waypoint x="1880" y="522" />
+        <di:waypoint x="1880" y="662" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1l1n5j5_di" bpmnElement="Flow_1l1n5j5">
-        <di:waypoint x="2210" y="522" />
-        <di:waypoint x="2251" y="522" />
+        <di:waypoint x="2010" y="522" />
+        <di:waypoint x="2051" y="522" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1i8r773_di" bpmnElement="Flow_1i8r773">
-        <di:waypoint x="1655" y="522" />
-        <di:waypoint x="2004" y="522" />
+        <di:waypoint x="1455" y="522" />
+        <di:waypoint x="1804" y="522" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_13ng1f4_di" bpmnElement="Flow_13ng1f4">
-        <di:waypoint x="1220" y="422" />
+        <di:waypoint x="1220" y="412" />
         <di:waypoint x="1220" y="360" />
         <di:waypoint x="1030" y="360" />
       </bpmndi:BPMNEdge>
@@ -817,51 +804,47 @@ Please fix.
         <di:waypoint x="535" y="522" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1v8dszb_di" bpmnElement="Flow_1v8dszb">
-        <di:waypoint x="2920" y="918" />
-        <di:waypoint x="2920" y="938" />
-        <di:waypoint x="3000" y="938" />
-        <di:waypoint x="3000" y="550" />
+        <di:waypoint x="2720" y="918" />
+        <di:waypoint x="2720" y="938" />
+        <di:waypoint x="2800" y="938" />
+        <di:waypoint x="2800" y="550" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0yvmfqu_di" bpmnElement="Flow_0yvmfqu">
-        <di:waypoint x="2940" y="860" />
-        <di:waypoint x="3210" y="860" />
-        <di:waypoint x="3210" y="412" />
-        <di:waypoint x="3325" y="412" />
+        <di:waypoint x="2740" y="860" />
+        <di:waypoint x="3010" y="860" />
+        <di:waypoint x="3010" y="412" />
+        <di:waypoint x="3125" y="412" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1mfw1j8_di" bpmnElement="Flow_1mfw1j8">
         <di:waypoint x="760" y="522" />
         <di:waypoint x="835" y="522" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_12cqm3u_di" bpmnElement="Flow_12cqm3u">
-        <di:waypoint x="1630" y="547" />
-        <di:waypoint x="1630" y="600" />
-        <di:waypoint x="1670" y="600" />
+        <di:waypoint x="1430" y="547" />
+        <di:waypoint x="1430" y="600" />
+        <di:waypoint x="1470" y="600" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0l5nhy3_di" bpmnElement="Flow_0l5nhy3">
-        <di:waypoint x="1980" y="600" />
-        <di:waypoint x="2029" y="600" />
-        <di:waypoint x="2029" y="547" />
+        <di:waypoint x="1780" y="600" />
+        <di:waypoint x="1829" y="600" />
+        <di:waypoint x="1829" y="547" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0wuedtr_di" bpmnElement="Flow_0wuedtr">
-        <di:waypoint x="1548" y="522" />
-        <di:waypoint x="1605" y="522" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Association_170uhu5_di" bpmnElement="Association_170uhu5">
-        <di:waypoint x="1537" y="306" />
-        <di:waypoint x="1527" y="274" />
+        <di:waypoint x="1348" y="522" />
+        <di:waypoint x="1405" y="522" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_12wlind_di" bpmnElement="Flow_12wlind">
-        <di:waypoint x="1770" y="600" />
-        <di:waypoint x="1880" y="600" />
+        <di:waypoint x="1570" y="600" />
+        <di:waypoint x="1680" y="600" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Participant_0a8arrz_di" bpmnElement="Participant_0a8arrz" isHorizontal="true">
-        <dc:Bounds x="1480" y="1180" width="320" height="80" />
+        <dc:Bounds x="1280" y="1180" width="320" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Participant_1qabwrg_di" bpmnElement="Participant_1qabwrg" isHorizontal="true">
-        <dc:Bounds x="1860" y="1180" width="299" height="80" />
+        <dc:Bounds x="1660" y="1180" width="299" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Participant_0b27sri_di" bpmnElement="Participant_0b27sri" isHorizontal="true">
-        <dc:Bounds x="3195" y="1160" width="307" height="80" />
+        <dc:Bounds x="2995" y="1160" width="307" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="TextAnnotation_1uaw1w7_di" bpmnElement="TextAnnotation_1uaw1w7">
         <dc:Bounds x="490" y="-170" width="580" height="30" />
@@ -875,36 +858,32 @@ Please fix.
         <di:waypoint x="1059" y="562" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="DataInputAssociation_1s1efok_di" bpmnElement="DataInputAssociation_1s1efok">
-        <di:waypoint x="1668" y="675" />
-        <di:waypoint x="1694" y="640" />
+        <di:waypoint x="1468" y="675" />
+        <di:waypoint x="1494" y="640" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="DataInputAssociation_0myc5qf_di" bpmnElement="DataInputAssociation_0myc5qf">
-        <di:waypoint x="1876" y="685" />
-        <di:waypoint x="1906" y="640" />
+        <di:waypoint x="1676" y="685" />
+        <di:waypoint x="1706" y="640" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Association_1eygti7_di" bpmnElement="Association_1eygti7">
         <di:waypoint x="756" y="-70" />
         <di:waypoint x="823" y="-140" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0ppupld_di" bpmnElement="Flow_0ppupld">
-        <di:waypoint x="1800" y="502" />
-        <di:waypoint x="1800" y="1180" />
+        <di:waypoint x="1600" y="502" />
+        <di:waypoint x="1600" y="1180" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0yfnc92_di" bpmnElement="Flow_0yfnc92">
-        <di:waypoint x="1930" y="640" />
-        <di:waypoint x="1930" y="1180" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0e6f26d_di" bpmnElement="Flow_0e6f26d">
-        <di:waypoint x="1570" y="306" />
-        <di:waypoint x="1570" y="150" />
+        <di:waypoint x="1730" y="640" />
+        <di:waypoint x="1730" y="1180" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0jciftq_di" bpmnElement="Flow_0jciftq">
-        <di:waypoint x="2150" y="482" />
-        <di:waypoint x="2150" y="150" />
+        <di:waypoint x="1950" y="482" />
+        <di:waypoint x="1950" y="150" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0p0bc5u_di" bpmnElement="Flow_0p0bc5u">
-        <di:waypoint x="3350" y="640" />
-        <di:waypoint x="3350" y="1160" />
+        <di:waypoint x="3150" y="640" />
+        <di:waypoint x="3150" y="1160" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0n9qxyw_di" bpmnElement="Flow_0n9qxyw">
         <di:waypoint x="860" y="482" />
@@ -914,16 +893,16 @@ Please fix.
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1getkzr_di" bpmnElement="Flow_1getkzr">
-        <di:waypoint x="3350" y="270" />
-        <di:waypoint x="3350" y="150" />
+        <di:waypoint x="3150" y="270" />
+        <di:waypoint x="3150" y="150" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0ozze4c_di" bpmnElement="Flow_0ozze4c">
-        <di:waypoint x="3000" y="470" />
-        <di:waypoint x="3000" y="150" />
+        <di:waypoint x="2800" y="470" />
+        <di:waypoint x="2800" y="150" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1dgkwzr_di" bpmnElement="Flow_1dgkwzr">
-        <di:waypoint x="3490" y="560" />
-        <di:waypoint x="3490" y="150" />
+        <di:waypoint x="3290" y="560" />
+        <di:waypoint x="3290" y="150" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>