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 7f7d163a..2693edb5 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
@@ -32,6 +32,8 @@
         <bpmn:flowNodeRef>Gateway_1717c0p</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0o1vc0a</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0p88elm</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_104xpp8</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_109lq0m</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_1lbghql</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_0x83ruk</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_0m3ri6v</bpmn:flowNodeRef>
@@ -43,7 +45,6 @@
         <bpmn:flowNodeRef>Event_1b58a3z</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_102t7tk</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0fq1nb4</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_104xpp8</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_1usbnt0</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>SubProcess_Data_validation_rules</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_show_errors</bpmn:flowNodeRef>
@@ -55,7 +56,6 @@
         <bpmn:flowNodeRef>Activity_080qvey</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0gkejaj</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1ucvkk4</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_109lq0m</bpmn:flowNodeRef>
       </bpmn:lane>
       <bpmn:lane id="Lane_1so23vf" name="Finance Team">
         <bpmn:flowNodeRef>Activity_0cdgqi0</bpmn:flowNodeRef>
@@ -288,6 +288,20 @@ isCurrentUser = True</spiffworkflow:preScript>
       <bpmn:incoming>Flow_0p6vvu0</bpmn:incoming>
       <bpmn:outgoing>Flow_0o94g4u</bpmn:outgoing>
     </bpmn:serviceTask>
+    <bpmn:scriptTask id="Activity_104xpp8" name="Set Invoice PDF Name" scriptFormat="python">
+      <bpmn:incoming>Flow_12cqm3u</bpmn:incoming>
+      <bpmn:outgoing>Flow_0p6vvu0</bpmn:outgoing>
+      <bpmn:script>invoice_file_name = invoice.contributorName + "_" + str(invoice.invoiceId) + ".pdf"</bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:sequenceFlow id="Flow_0u5z1vc" sourceRef="Activity_109lq0m" targetRef="Gateway_05ov5p5" />
+    <bpmn:scriptTask id="Activity_109lq0m" name="Set Invoice Status to Awaiting Approval" scriptFormat="python">
+      <bpmn:incoming>Flow_1x4rtop</bpmn:incoming>
+      <bpmn:outgoing>Flow_0u5z1vc</bpmn:outgoing>
+      <bpmn:script># Set Invoice Status
+invoice["invoiceStatus"] = "Awaiting approval"
+temp_test = invoice["invoiceStatus"]
+# temp_message = "hello " + invoice.invoiceStatus</bpmn:script>
+    </bpmn:scriptTask>
     <bpmn:exclusiveGateway id="Gateway_1lbghql" name="Match?" default="Flow_1gohkts">
       <bpmn:incoming>Flow_1c5u447</bpmn:incoming>
       <bpmn:outgoing>Flow_1gohkts</bpmn:outgoing>
@@ -322,6 +336,119 @@ isCurrentUser = True</spiffworkflow:preScript>
       <bpmn:outgoing>Flow_18xvx8w</bpmn:outgoing>
       <bpmn:outgoing>Flow_0bfs2xe</bpmn:outgoing>
     </bpmn:exclusiveGateway>
+    <bpmn:serviceTask id="Activity_1ftzr6x" name="4b. Notify CC via Waku&#10;&#34;invoice rejected&#34;">
+      <bpmn:extensionElements>
+        <spiffworkflow:serviceTaskOperator id="waku/SendMessage" resultVariable="waku_response">
+          <spiffworkflow:parameters>
+            <spiffworkflow:parameter id="message" type="str" value="&#34;Hi &#34; + current_user_extras[&#34;first_name&#34;] + &#34;, your invoice has been rejected. The reason specified for the rejection is: [&#34; + invoice.comment + &#34;]. Please get in touch with your Project Lead to discuss this further.\nInvoice no: &#34; + invoice.invoiceId + &#34;\nAmount: &#34; + invoice.invoiceCurrency + f&#39;{invoice.invoiceAmount:.2f}&#39; + &#34;\nDate submitted: &#34; + invoice.invoiceDate + &#34;\nStatus: &#34; + invoice.invoiceStatus + &#34;\nProcess Instance Id: &#34; + str(process_instance_id) + &#34;\nLink to Spiff: https://demo.spiffworkflow.org/&#34;" />
+            <spiffworkflow:parameter id="message_type" type="str" value="&#34;wakuext_sendOneToOneMessage&#34;" />
+            <spiffworkflow:parameter id="recipient" type="str" value="team_lead_info[&#34;status_key&#34;]" />
+          </spiffworkflow:parameters>
+        </spiffworkflow:serviceTaskOperator>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_1v8dszb</bpmn:incoming>
+      <bpmn:outgoing>Flow_1wturr2</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:endEvent id="Event_0f3d2bp" name="Invoice is declined due to Approver inaction">
+      <bpmn:incoming>Flow_1wturr2</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:userTask id="Activity_06b32ar" name="Approve invocie manually">
+      <bpmn:extensionElements>
+        <spiffworkflow:properties>
+          <spiffworkflow:property name="formJsonSchemaFilename" value="invoice-approval_JSONSchema.json" />
+          <spiffworkflow:property name="formUiSchemaFilename" value="invoice-approval_UISchema.json" />
+        </spiffworkflow:properties>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_0lfqk0y</bpmn:incoming>
+      <bpmn:outgoing>Flow_0yvmfqu</bpmn:outgoing>
+    </bpmn:userTask>
+    <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_1n239ad</bpmn:incoming>
+      <bpmn:outgoing>Flow_1ex5hfx</bpmn:outgoing>
+    </bpmn:intermediateThrowEvent>
+    <bpmn:serviceTask id="Activity_0fsoa08" name="4c. Notify CC via Waku&#10;&#34;invoice rejected&#34;">
+      <bpmn:extensionElements>
+        <spiffworkflow:serviceTaskOperator id="waku/SendMessage" resultVariable="waku_response">
+          <spiffworkflow:parameters>
+            <spiffworkflow:parameter id="message" type="str" value="&#34;Hi &#34; + current_user_extras[&#34;first_name&#34;] + &#34;, your invoice has been rejected. The reason specified for the rejection is: [&#34; + invoice.comment + &#34;]. Please get in touch with your Project Lead to discuss this further.\nInvoice no: &#34; + invoice.invoiceId + &#34;\nAmount: &#34; + invoice.invoiceCurrency + f&#39;{invoice.invoiceAmount:.2f}&#39; + &#34;\nDate submitted: &#34; + invoice.invoiceDate + &#34;\nStatus: &#34; + invoice.invoiceStatus + &#34;\nProcess Instance Id: &#34; + str(process_instance_id) + &#34;\nLink to Spiff: https://demo.spiffworkflow.org/&#34;" />
+            <spiffworkflow:parameter id="message_type" type="str" value="&#34;wakuext_sendOneToOneMessage&#34;" />
+            <spiffworkflow:parameter id="recipient" type="str" value="current_user_extras[&#34;status_key&#34;]" />
+          </spiffworkflow:parameters>
+        </spiffworkflow:serviceTaskOperator>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_0bfs2xe</bpmn:incoming>
+      <bpmn:outgoing>Flow_0c0c9mw</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:serviceTask id="Activity_1lq96cy" name="7. Notify Finance via Waku&#34;invoice received and approved&#34;">
+      <bpmn:extensionElements>
+        <spiffworkflow:serviceTaskOperator id="waku/SendMessage" resultVariable="waku_response">
+          <spiffworkflow:parameters>
+            <spiffworkflow:parameter id="message" type="str" value="&#34;An invoice has been submitted and approved.\nSubmitted by: &#34; + current_user_extras[&#34;first_name&#34;] + &#34;\nInvoice no: &#34; + invoice.invoiceId + &#34;\nAmount: &#34; + invoice.invoiceCurrency + f&#39;{invoice.invoiceAmount:.2f}&#39; + &#34;\nDate submitted: &#34; + invoice.invoiceDate + &#34;\nStatus: &#34; + invoice.invoiceStatus + &#34;\nProcess Instance Id: &#34; + str(process_instance_id) + &#34;\nLink to Spiff: https://demo.spiffworkflow.org/&#34;" />
+            <spiffworkflow:parameter id="message_type" type="str" value="&#34;wakuext_sendOneToOneMessage&#34;" />
+            <spiffworkflow:parameter id="recipient" type="str" value="&#34;0x04cf9f835bfb5f5b94b4c6f36378fd14bde09960a4d021928981125d314fa423fa79cde37003b9c6135b52dc20734590dcac5a68b73af74d58060628b2c531faf1&#34;" />
+          </spiffworkflow:parameters>
+        </spiffworkflow:serviceTaskOperator>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_18xvx8w</bpmn:incoming>
+      <bpmn:incoming>Flow_04ccp12</bpmn:incoming>
+      <bpmn:outgoing>Flow_1ds4s8o</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:userTask id="Activity_0cdgqi0" name="Approve Invoice">
+      <bpmn:extensionElements>
+        <spiffworkflow:properties>
+          <spiffworkflow:property name="formJsonSchemaFilename" value="invoice-approval_JSONSchema.json" />
+          <spiffworkflow:property name="formUiSchemaFilename" value="invoice-approval_UISchema.json" />
+        </spiffworkflow:properties>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_1ds4s8o</bpmn:incoming>
+      <bpmn:outgoing>Flow_09wwily</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:endEvent id="Event_1b58a3z" name="Invoice is rejected by Approver">
+      <bpmn:incoming>Flow_0c0c9mw</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:serviceTask id="Activity_102t7tk" name="6. Notify CC via Waku&#10;&#34;invoice approved&#34;">
+      <bpmn:extensionElements>
+        <spiffworkflow:serviceTaskOperator id="waku/SendMessage" resultVariable="waku_response">
+          <spiffworkflow:parameters>
+            <spiffworkflow:parameter id="message" type="str" value="&#34;Hi &#34; + current_user_extras[&#34;first_name&#34;] + &#34;, your invoice has been approved. It will be paid in the next pay run.\nInvoice no: &#34; + invoice.invoiceId + &#34;\nAmount: &#34; + invoice.invoiceCurrency + f&#39;{invoice.invoiceAmount:.2f}&#39; + &#34;\nDate submitted: &#34; + invoice.invoiceDate + &#34;\nStatus: &#34; + invoice.invoiceStatus + &#34;\nProcess Instance Id: &#34; + str(process_instance_id) + &#34;\nLink to Spiff: https://demo.spiffworkflow.org/&#34;" />
+            <spiffworkflow:parameter id="message_type" type="str" value="&#34;wakuext_sendOneToOneMessage&#34;" />
+            <spiffworkflow:parameter id="recipient" type="str" value="current_user_extras[&#34;status_key&#34;]" />
+          </spiffworkflow:parameters>
+        </spiffworkflow:serviceTaskOperator>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_053ca95</bpmn:incoming>
+      <bpmn:outgoing>Flow_1r0a699</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:serviceTask id="Activity_0fq1nb4" name="5. Create Invoice in Xero">
+      <bpmn:extensionElements>
+        <spiffworkflow:serviceTaskOperator id="xero/CreateInvoice">
+          <spiffworkflow:parameters>
+            <spiffworkflow:parameter id="access_token" type="any" value="&#34;secret:xero/OAuth&#34;" />
+            <spiffworkflow:parameter id="amount" type="str" value="str(invoice_amount)" />
+            <spiffworkflow:parameter id="contact_email" type="str" value="current_user_extras[&#34;email&#34;]" />
+            <spiffworkflow:parameter id="contact_name" type="str" value="current_user_extras[&#34;full_name&#34;]" />
+            <spiffworkflow:parameter id="description" type="str" value="&#34;Test for now&#34;" />
+          </spiffworkflow:parameters>
+        </spiffworkflow:serviceTaskOperator>
+        <spiffworkflow:preScript />
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_0h96w9j</bpmn:incoming>
+      <bpmn:outgoing>Flow_053ca95</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:endEvent id="Event_16u0f7b" name="Invoice is ready for payment" />
+    <bpmn:exclusiveGateway id="Gateway_1ytq6m7" name="Approved?" default="Flow_0h96w9j">
+      <bpmn:incoming>Flow_09wwily</bpmn:incoming>
+      <bpmn:outgoing>Flow_00kky3k</bpmn:outgoing>
+      <bpmn:outgoing>Flow_0h96w9j</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:dataObjectReference id="DataObjectReference_0okfp91" name="wr-notify_cc_invoice_uploaded" dataObjectRef="wr-notify_cc_invoice_uploaded" />
+    <bpmn:dataObject id="wr-notify_cc_invoice_uploaded" />
+    <bpmn:dataObjectReference id="DataObjectReference_12rfrua" name="wr" dataObjectRef="wr" />
+    <bpmn:dataObject id="wr" />
+    <bpmn:endEvent id="Event_1usbnt0">
+      <bpmn:incoming>Flow_1r0a699</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>
@@ -405,37 +532,6 @@ isCurrentUser = True</spiffworkflow:preScript>
         <bpmn:outgoing>Flow_01eh2ws</bpmn:outgoing>
       </bpmn:serviceTask>
     </bpmn:subProcess>
-    <bpmn:serviceTask id="Activity_1ftzr6x" name="4b. Notify CC via Waku&#10;&#34;invoice rejected&#34;">
-      <bpmn:extensionElements>
-        <spiffworkflow:serviceTaskOperator id="waku/SendMessage" resultVariable="waku_response">
-          <spiffworkflow:parameters>
-            <spiffworkflow:parameter id="message" type="str" value="&#34;Hi &#34; + current_user_extras[&#34;first_name&#34;] + &#34;, your invoice has been rejected. The reason specified for the rejection is: [&#34; + invoice.comment + &#34;]. Please get in touch with your Project Lead to discuss this further.\nInvoice no: &#34; + invoice.invoiceId + &#34;\nAmount: &#34; + invoice.invoiceCurrency + f&#39;{invoice.invoiceAmount:.2f}&#39; + &#34;\nDate submitted: &#34; + invoice.invoiceDate + &#34;\nStatus: &#34; + invoice.invoiceStatus + &#34;\nProcess Instance Id: &#34; + str(process_instance_id) + &#34;\nLink to Spiff: https://demo.spiffworkflow.org/&#34;" />
-            <spiffworkflow:parameter id="message_type" type="str" value="&#34;wakuext_sendOneToOneMessage&#34;" />
-            <spiffworkflow:parameter id="recipient" type="str" value="team_lead_info[&#34;status_key&#34;]" />
-          </spiffworkflow:parameters>
-        </spiffworkflow:serviceTaskOperator>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_1v8dszb</bpmn:incoming>
-      <bpmn:outgoing>Flow_1wturr2</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:endEvent id="Event_0f3d2bp" name="Invoice is declined due to Approver inaction">
-      <bpmn:incoming>Flow_1wturr2</bpmn:incoming>
-    </bpmn:endEvent>
-    <bpmn:userTask id="Activity_06b32ar" name="Approve invocie manually">
-      <bpmn:extensionElements>
-        <spiffworkflow:properties>
-          <spiffworkflow:property name="formJsonSchemaFilename" value="invoice-approval_JSONSchema.json" />
-          <spiffworkflow:property name="formUiSchemaFilename" value="invoice-approval_UISchema.json" />
-        </spiffworkflow:properties>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_0lfqk0y</bpmn:incoming>
-      <bpmn:outgoing>Flow_0yvmfqu</bpmn:outgoing>
-    </bpmn:userTask>
-    <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_1n239ad</bpmn:incoming>
-      <bpmn:outgoing>Flow_1ex5hfx</bpmn:outgoing>
-    </bpmn:intermediateThrowEvent>
     <bpmn:subProcess id="Activity_1ucvkk4" name="Send Team Lead Notification">
       <bpmn:incoming>Flow_0kngdw4</bpmn:incoming>
       <bpmn:outgoing>Flow_0lfqk0y</bpmn:outgoing>
@@ -510,108 +606,12 @@ del(userStatusKey)</bpmn:script>
       <bpmn:sequenceFlow id="Flow_0mwwhvb" sourceRef="Activity_00b66gy" targetRef="Activity_0lmpdui" />
       <bpmn:sequenceFlow id="Flow_04uuejh" sourceRef="Activity_0lmpdui" targetRef="Activity_1ve0iqu" />
     </bpmn:subProcess>
-    <bpmn:serviceTask id="Activity_0fsoa08" name="4c. Notify CC via Waku&#10;&#34;invoice rejected&#34;">
-      <bpmn:extensionElements>
-        <spiffworkflow:serviceTaskOperator id="waku/SendMessage" resultVariable="waku_response">
-          <spiffworkflow:parameters>
-            <spiffworkflow:parameter id="message" type="str" value="&#34;Hi &#34; + current_user_extras[&#34;first_name&#34;] + &#34;, your invoice has been rejected. The reason specified for the rejection is: [&#34; + invoice.comment + &#34;]. Please get in touch with your Project Lead to discuss this further.\nInvoice no: &#34; + invoice.invoiceId + &#34;\nAmount: &#34; + invoice.invoiceCurrency + f&#39;{invoice.invoiceAmount:.2f}&#39; + &#34;\nDate submitted: &#34; + invoice.invoiceDate + &#34;\nStatus: &#34; + invoice.invoiceStatus + &#34;\nProcess Instance Id: &#34; + str(process_instance_id) + &#34;\nLink to Spiff: https://demo.spiffworkflow.org/&#34;" />
-            <spiffworkflow:parameter id="message_type" type="str" value="&#34;wakuext_sendOneToOneMessage&#34;" />
-            <spiffworkflow:parameter id="recipient" type="str" value="current_user_extras[&#34;status_key&#34;]" />
-          </spiffworkflow:parameters>
-        </spiffworkflow:serviceTaskOperator>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_0bfs2xe</bpmn:incoming>
-      <bpmn:outgoing>Flow_0c0c9mw</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:serviceTask id="Activity_1lq96cy" name="7. Notify Finance via Waku&#34;invoice received and approved&#34;">
-      <bpmn:extensionElements>
-        <spiffworkflow:serviceTaskOperator id="waku/SendMessage" resultVariable="waku_response">
-          <spiffworkflow:parameters>
-            <spiffworkflow:parameter id="message" type="str" value="&#34;An invoice has been submitted and approved.\nSubmitted by: &#34; + current_user_extras[&#34;first_name&#34;] + &#34;\nInvoice no: &#34; + invoice.invoiceId + &#34;\nAmount: &#34; + invoice.invoiceCurrency + f&#39;{invoice.invoiceAmount:.2f}&#39; + &#34;\nDate submitted: &#34; + invoice.invoiceDate + &#34;\nStatus: &#34; + invoice.invoiceStatus + &#34;\nProcess Instance Id: &#34; + str(process_instance_id) + &#34;\nLink to Spiff: https://demo.spiffworkflow.org/&#34;" />
-            <spiffworkflow:parameter id="message_type" type="str" value="&#34;wakuext_sendOneToOneMessage&#34;" />
-            <spiffworkflow:parameter id="recipient" type="str" value="&#34;0x04cf9f835bfb5f5b94b4c6f36378fd14bde09960a4d021928981125d314fa423fa79cde37003b9c6135b52dc20734590dcac5a68b73af74d58060628b2c531faf1&#34;" />
-          </spiffworkflow:parameters>
-        </spiffworkflow:serviceTaskOperator>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_18xvx8w</bpmn:incoming>
-      <bpmn:incoming>Flow_04ccp12</bpmn:incoming>
-      <bpmn:outgoing>Flow_1ds4s8o</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:userTask id="Activity_0cdgqi0" name="Approve Invoice">
-      <bpmn:extensionElements>
-        <spiffworkflow:properties>
-          <spiffworkflow:property name="formJsonSchemaFilename" value="invoice-approval_JSONSchema.json" />
-          <spiffworkflow:property name="formUiSchemaFilename" value="invoice-approval_UISchema.json" />
-        </spiffworkflow:properties>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_1ds4s8o</bpmn:incoming>
-      <bpmn:outgoing>Flow_09wwily</bpmn:outgoing>
-    </bpmn:userTask>
-    <bpmn:endEvent id="Event_1b58a3z" name="Invoice is rejected by Approver">
-      <bpmn:incoming>Flow_0c0c9mw</bpmn:incoming>
-    </bpmn:endEvent>
-    <bpmn:serviceTask id="Activity_102t7tk" name="6. Notify CC via Waku&#10;&#34;invoice approved&#34;">
-      <bpmn:extensionElements>
-        <spiffworkflow:serviceTaskOperator id="waku/SendMessage" resultVariable="waku_response">
-          <spiffworkflow:parameters>
-            <spiffworkflow:parameter id="message" type="str" value="&#34;Hi &#34; + current_user_extras[&#34;first_name&#34;] + &#34;, your invoice has been approved. It will be paid in the next pay run.\nInvoice no: &#34; + invoice.invoiceId + &#34;\nAmount: &#34; + invoice.invoiceCurrency + f&#39;{invoice.invoiceAmount:.2f}&#39; + &#34;\nDate submitted: &#34; + invoice.invoiceDate + &#34;\nStatus: &#34; + invoice.invoiceStatus + &#34;\nProcess Instance Id: &#34; + str(process_instance_id) + &#34;\nLink to Spiff: https://demo.spiffworkflow.org/&#34;" />
-            <spiffworkflow:parameter id="message_type" type="str" value="&#34;wakuext_sendOneToOneMessage&#34;" />
-            <spiffworkflow:parameter id="recipient" type="str" value="current_user_extras[&#34;status_key&#34;]" />
-          </spiffworkflow:parameters>
-        </spiffworkflow:serviceTaskOperator>
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_053ca95</bpmn:incoming>
-      <bpmn:outgoing>Flow_1r0a699</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:serviceTask id="Activity_0fq1nb4" name="5. Create Invoice in Xero">
-      <bpmn:extensionElements>
-        <spiffworkflow:serviceTaskOperator id="xero/CreateInvoice">
-          <spiffworkflow:parameters>
-            <spiffworkflow:parameter id="access_token" type="any" value="&#34;secret:xero/OAuth&#34;" />
-            <spiffworkflow:parameter id="amount" type="str" value="str(invoice_amount)" />
-            <spiffworkflow:parameter id="contact_email" type="str" value="current_user_extras[&#34;email&#34;]" />
-            <spiffworkflow:parameter id="contact_name" type="str" value="current_user_extras[&#34;full_name&#34;]" />
-            <spiffworkflow:parameter id="description" type="str" value="&#34;Test for now&#34;" />
-          </spiffworkflow:parameters>
-        </spiffworkflow:serviceTaskOperator>
-        <spiffworkflow:preScript />
-      </bpmn:extensionElements>
-      <bpmn:incoming>Flow_0h96w9j</bpmn:incoming>
-      <bpmn:outgoing>Flow_053ca95</bpmn:outgoing>
-    </bpmn:serviceTask>
-    <bpmn:endEvent id="Event_16u0f7b" name="Invoice is ready for payment" />
-    <bpmn:exclusiveGateway id="Gateway_1ytq6m7" name="Approved?" default="Flow_0h96w9j">
-      <bpmn:incoming>Flow_09wwily</bpmn:incoming>
-      <bpmn:outgoing>Flow_00kky3k</bpmn:outgoing>
-      <bpmn:outgoing>Flow_0h96w9j</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
-    <bpmn:scriptTask id="Activity_104xpp8" name="Set Invoice PDF Name" scriptFormat="python">
-      <bpmn:incoming>Flow_12cqm3u</bpmn:incoming>
-      <bpmn:outgoing>Flow_0p6vvu0</bpmn:outgoing>
-      <bpmn:script>invoice_file_name = invoice.contributorName + "_" + str(invoice.invoiceId) + ".pdf"</bpmn:script>
-    </bpmn:scriptTask>
-    <bpmn:dataObjectReference id="DataObjectReference_0okfp91" name="wr-notify_cc_invoice_uploaded" dataObjectRef="wr-notify_cc_invoice_uploaded" />
-    <bpmn:dataObject id="wr-notify_cc_invoice_uploaded" />
-    <bpmn:dataObjectReference id="DataObjectReference_12rfrua" name="wr" dataObjectRef="wr" />
-    <bpmn:dataObject id="wr" />
-    <bpmn:endEvent id="Event_1usbnt0">
-      <bpmn:incoming>Flow_1r0a699</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:timeDuration xsi:type="bpmn:tFormalExpression">timedelta(minutes=3)</bpmn:timeDuration>
       </bpmn:timerEventDefinition>
     </bpmn:boundaryEvent>
-    <bpmn:sequenceFlow id="Flow_0u5z1vc" sourceRef="Activity_109lq0m" targetRef="Gateway_05ov5p5" />
-    <bpmn:scriptTask id="Activity_109lq0m" name="Set Invoice Status to Awaiting Approval" scriptFormat="python">
-      <bpmn:incoming>Flow_1x4rtop</bpmn:incoming>
-      <bpmn:outgoing>Flow_0u5z1vc</bpmn:outgoing>
-      <bpmn:script># Set Invoice Status
-invoice["invoiceStatus"] = "Awaiting approval"
-temp_test = invoice["invoiceStatus"]
-# temp_message = "hello " + invoice.invoiceStatus</bpmn:script>
-    </bpmn:scriptTask>
   </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" />
@@ -632,20 +632,20 @@ temp_test = invoice["invoiceStatus"]
   <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="3930" height="220" />
+        <dc:Bounds x="280" y="-70" width="3980" height="220" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Participant_11ab2hx_di" bpmnElement="Participant_11ab2hx" isHorizontal="true">
-        <dc:Bounds x="280" y="210" width="3930" height="920" />
+        <dc:Bounds x="280" y="210" width="3980" height="920" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Lane_1b7abal_di" bpmnElement="Lane_1b7abal" isHorizontal="true">
-        <dc:Bounds x="310" y="800" width="3900" height="212" />
+        <dc:Bounds x="310" y="800" width="3950" height="212" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Lane_1so23vf_di" bpmnElement="Lane_1so23vf" isHorizontal="true">
-        <dc:Bounds x="310" y="1012" width="3900" height="118" />
+        <dc:Bounds x="310" y="1012" width="3950" height="118" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Lane_1a0qu8e_di" bpmnElement="Lane_1a0qu8e" isHorizontal="true">
-        <dc:Bounds x="310" y="210" width="3900" height="590" />
+        <dc:Bounds x="310" y="210" width="3950" height="590" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1h7igan_di" bpmnElement="Submit_the_invoice">
@@ -669,109 +669,109 @@ temp_test = invoice["invoiceStatus"]
       <bpmndi:BPMNShape id="Activity_0zssftc_di" bpmnElement="Activity_0p88elm">
         <dc:Bounds x="1880" y="560" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_1lbghql_di" bpmnElement="Gateway_1lbghql" isMarkerVisible="true">
-        <dc:Bounds x="2684" y="497" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2740" y="513" width="37" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0x83ruk_di" bpmnElement="Event_0x83ruk">
-        <dc:Bounds x="2741" y="394" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2719" y="358" width="81" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0m3ri6v_di" bpmnElement="Event_0m3ri6v">
-        <dc:Bounds x="2741" y="582" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2732" y="625" width="57" height="40" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1jg5wtk_di" bpmnElement="Activity_0cfvsk7">
-        <dc:Bounds x="2270" y="482" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_1l4tz4i_di" bpmnElement="Gateway_1l4tz4i" isMarkerVisible="true">
-        <dc:Bounds x="3485" y="387" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3533" y="383" width="54" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0dh2tfy_di" bpmnElement="Activity_1ftzr6x">
-        <dc:Bounds x="3160" y="898" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_0f3d2bp_di" bpmnElement="Event_0f3d2bp">
-        <dc:Bounds x="3312" y="920" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3290" y="966" width="86" height="40" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_05nao2p_di" bpmnElement="Activity_06b32ar">
-        <dc:Bounds x="3000" y="820" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_15y55nw_di" bpmnElement="Event_15y55nw">
-        <dc:Bounds x="2452" y="504" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2446" y="547" width="48" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0kcw8l6_di" bpmnElement="Activity_0fsoa08">
-        <dc:Bounds x="3460" y="260" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0latih8_di" bpmnElement="Activity_1lq96cy">
-        <dc:Bounds x="3460" y="560" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0xwniza_di" bpmnElement="Activity_0cdgqi0">
-        <dc:Bounds x="3460" y="1030" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1b58a3z_di" bpmnElement="Event_1b58a3z">
-        <dc:Bounds x="3592" y="282" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3586" y="325" width="54" height="40" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0q5d0ku_di" bpmnElement="Activity_102t7tk">
-        <dc:Bounds x="3970" y="560" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0ejn04g_di" bpmnElement="Activity_0fq1nb4">
-        <dc:Bounds x="3820" y="560" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_16u0f7b_di" bpmnElement="Event_16u0f7b">
-        <dc:Bounds x="4102" y="1052" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="4082" y="1096" width="77" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_1ytq6m7_di" bpmnElement="Gateway_1ytq6m7" isMarkerVisible="true">
-        <dc:Bounds x="3615" y="1045" width="50" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="3613" y="1102" width="54" 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" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="DataObjectReference_0okfp91_di" bpmnElement="DataObjectReference_0okfp91">
-        <dc:Bounds x="2542" y="315" width="36" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2521" y="355" width="78" height="40" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="DataObjectReference_12rfrua_di" bpmnElement="DataObjectReference_12rfrua">
-        <dc:Bounds x="2372" y="365" width="36" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="2384" y="418" width="12" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1usbnt0_di" bpmnElement="Event_1usbnt0">
-        <dc:Bounds x="4102" y="582" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_08ykqm8_di" bpmnElement="Activity_109lq0m">
         <dc:Bounds x="1450" y="482" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1lbghql_di" bpmnElement="Gateway_1lbghql" isMarkerVisible="true">
+        <dc:Bounds x="2734" y="497" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2790" y="513" width="37" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0x83ruk_di" bpmnElement="Event_0x83ruk">
+        <dc:Bounds x="2791" y="394" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2769" y="358" width="81" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0m3ri6v_di" bpmnElement="Event_0m3ri6v">
+        <dc:Bounds x="2791" y="582" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2782" y="625" width="57" height="40" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1jg5wtk_di" bpmnElement="Activity_0cfvsk7">
+        <dc:Bounds x="2320" y="482" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1l4tz4i_di" bpmnElement="Gateway_1l4tz4i" isMarkerVisible="true">
+        <dc:Bounds x="3535" y="387" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3583" y="383" width="54" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0dh2tfy_di" bpmnElement="Activity_1ftzr6x">
+        <dc:Bounds x="3210" y="898" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_0f3d2bp_di" bpmnElement="Event_0f3d2bp">
+        <dc:Bounds x="3362" y="920" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3340" y="966" width="86" height="40" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_05nao2p_di" bpmnElement="Activity_06b32ar">
+        <dc:Bounds x="3050" y="820" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_15y55nw_di" bpmnElement="Event_15y55nw">
+        <dc:Bounds x="2502" y="504" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2496" y="547" width="48" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0kcw8l6_di" bpmnElement="Activity_0fsoa08">
+        <dc:Bounds x="3510" y="260" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0latih8_di" bpmnElement="Activity_1lq96cy">
+        <dc:Bounds x="3510" y="560" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0xwniza_di" bpmnElement="Activity_0cdgqi0">
+        <dc:Bounds x="3510" y="1030" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1b58a3z_di" bpmnElement="Event_1b58a3z">
+        <dc:Bounds x="3642" y="282" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3636" y="325" width="54" height="40" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0q5d0ku_di" bpmnElement="Activity_102t7tk">
+        <dc:Bounds x="4020" y="560" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0ejn04g_di" bpmnElement="Activity_0fq1nb4">
+        <dc:Bounds x="3870" y="560" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_16u0f7b_di" bpmnElement="Event_16u0f7b">
+        <dc:Bounds x="4152" y="1052" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="4132" y="1096" width="77" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1ytq6m7_di" bpmnElement="Gateway_1ytq6m7" isMarkerVisible="true">
+        <dc:Bounds x="3665" y="1045" width="50" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="3663" y="1102" width="54" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="DataObjectReference_0okfp91_di" bpmnElement="DataObjectReference_0okfp91">
+        <dc:Bounds x="2592" y="315" width="36" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2571" y="355" width="78" height="40" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="DataObjectReference_12rfrua_di" bpmnElement="DataObjectReference_12rfrua">
+        <dc:Bounds x="2422" y="365" width="36" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="2434" y="418" width="12" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1usbnt0_di" bpmnElement="Event_1usbnt0">
+        <dc:Bounds x="4152" y="582" width="36" height="36" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0z13hw3_di" bpmnElement="SubProcess_Data_validation_rules">
         <dc:Bounds x="1170" y="482" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -803,16 +803,16 @@ temp_test = invoice["invoiceStatus"]
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1rn2mgi_di" bpmnElement="Activity_0gkejaj">
-        <dc:Bounds x="2529" y="482" width="100" height="80" />
+        <dc:Bounds x="2579" y="482" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0j807g0_di" bpmnElement="Activity_1ucvkk4">
-        <dc:Bounds x="3000" y="372" width="100" height="80" />
+        <dc:Bounds x="3050" y="372" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_1n1umf8_di" bpmnElement="Event_09q0ym0">
-        <dc:Bounds x="3062" y="882" width="36" height="36" />
+        <dc:Bounds x="3112" y="882" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="3064" y="925" width="33" height="14" />
+          <dc:Bounds x="3114" y="925" width="33" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_1x4rtop_di" bpmnElement="Flow_1x4rtop">
@@ -830,50 +830,50 @@ temp_test = invoice["invoiceStatus"]
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1c5u447_di" bpmnElement="Flow_1c5u447">
-        <di:waypoint x="2629" y="522" />
-        <di:waypoint x="2684" y="522" />
+        <di:waypoint x="2679" y="522" />
+        <di:waypoint x="2734" y="522" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1gohkts_di" bpmnElement="Flow_1gohkts">
-        <di:waypoint x="2709" y="547" />
-        <di:waypoint x="2709" y="600" />
-        <di:waypoint x="2741" y="600" />
+        <di:waypoint x="2759" y="547" />
+        <di:waypoint x="2759" y="600" />
+        <di:waypoint x="2791" y="600" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2716" y="570" width="18" height="14" />
+          <dc:Bounds x="2766" y="570" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_18xvx8w_di" bpmnElement="Flow_18xvx8w">
-        <di:waypoint x="3510" y="437" />
-        <di:waypoint x="3510" y="560" />
+        <di:waypoint x="3560" y="437" />
+        <di:waypoint x="3560" y="560" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="3517" y="497" width="18" height="14" />
+          <dc:Bounds x="3567" y="497" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1ex5hfx_di" bpmnElement="Flow_1ex5hfx">
-        <di:waypoint x="2488" y="522" />
-        <di:waypoint x="2529" y="522" />
+        <di:waypoint x="2538" y="522" />
+        <di:waypoint x="2579" y="522" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_16bw9hx_di" bpmnElement="Flow_16bw9hx">
-        <di:waypoint x="2709" y="497" />
-        <di:waypoint x="2709" y="412" />
-        <di:waypoint x="2741" y="412" />
+        <di:waypoint x="2759" y="497" />
+        <di:waypoint x="2759" y="412" />
+        <di:waypoint x="2791" y="412" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2717" y="454" width="15" height="14" />
+          <dc:Bounds x="2767" y="454" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1wturr2_di" bpmnElement="Flow_1wturr2">
-        <di:waypoint x="3260" y="938" />
-        <di:waypoint x="3312" y="938" />
+        <di:waypoint x="3310" y="938" />
+        <di:waypoint x="3362" y="938" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0bfs2xe_di" bpmnElement="Flow_0bfs2xe">
-        <di:waypoint x="3510" y="387" />
-        <di:waypoint x="3510" y="340" />
+        <di:waypoint x="3560" y="387" />
+        <di:waypoint x="3560" y="340" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="3518" y="353" width="15" height="14" />
+          <dc:Bounds x="3568" y="353" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0c0c9mw_di" bpmnElement="Flow_0c0c9mw">
-        <di:waypoint x="3560" y="300" />
-        <di:waypoint x="3592" y="300" />
+        <di:waypoint x="3610" y="300" />
+        <di:waypoint x="3642" y="300" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_13ng1f4_di" bpmnElement="Flow_13ng1f4">
         <di:waypoint x="1370" y="412" />
@@ -894,15 +894,15 @@ temp_test = invoice["invoiceStatus"]
         <di:waypoint x="1345" y="522" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1v8dszb_di" bpmnElement="Flow_1v8dszb">
-        <di:waypoint x="3080" y="918" />
-        <di:waypoint x="3080" y="938" />
-        <di:waypoint x="3160" y="938" />
+        <di:waypoint x="3130" y="918" />
+        <di:waypoint x="3130" y="938" />
+        <di:waypoint x="3210" y="938" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0yvmfqu_di" bpmnElement="Flow_0yvmfqu">
-        <di:waypoint x="3100" y="860" />
-        <di:waypoint x="3370" y="860" />
-        <di:waypoint x="3370" y="412" />
-        <di:waypoint x="3485" y="412" />
+        <di:waypoint x="3150" y="860" />
+        <di:waypoint x="3420" y="860" />
+        <di:waypoint x="3420" y="412" />
+        <di:waypoint x="3535" y="412" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_12cqm3u_di" bpmnElement="Flow_12cqm3u">
         <di:waypoint x="1630" y="547" />
@@ -933,53 +933,53 @@ temp_test = invoice["invoiceStatus"]
         <di:waypoint x="685" y="520" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1n239ad_di" bpmnElement="Flow_1n239ad">
-        <di:waypoint x="2370" y="522" />
-        <di:waypoint x="2452" y="522" />
+        <di:waypoint x="2420" y="522" />
+        <di:waypoint x="2502" y="522" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_04ccp12_di" bpmnElement="Flow_04ccp12">
-        <di:waypoint x="2777" y="600" />
-        <di:waypoint x="3460" y="600" />
+        <di:waypoint x="2827" y="600" />
+        <di:waypoint x="3510" y="600" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1r0a699_di" bpmnElement="Flow_1r0a699">
-        <di:waypoint x="4070" y="600" />
-        <di:waypoint x="4102" y="600" />
+        <di:waypoint x="4120" y="600" />
+        <di:waypoint x="4152" y="600" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0kngdw4_di" bpmnElement="Flow_0kngdw4">
-        <di:waypoint x="2777" y="412" />
-        <di:waypoint x="3000" y="412" />
+        <di:waypoint x="2827" y="412" />
+        <di:waypoint x="3050" y="412" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0lfqk0y_di" bpmnElement="Flow_0lfqk0y">
-        <di:waypoint x="3050" y="452" />
-        <di:waypoint x="3050" y="820" />
+        <di:waypoint x="3100" y="452" />
+        <di:waypoint x="3100" y="820" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1ds4s8o_di" bpmnElement="Flow_1ds4s8o">
-        <di:waypoint x="3510" y="640" />
-        <di:waypoint x="3510" y="1030" />
+        <di:waypoint x="3560" y="640" />
+        <di:waypoint x="3560" y="1030" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_09wwily_di" bpmnElement="Flow_09wwily">
-        <di:waypoint x="3560" y="1070" />
-        <di:waypoint x="3615" y="1070" />
+        <di:waypoint x="3610" y="1070" />
+        <di:waypoint x="3665" y="1070" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_00kky3k_di" bpmnElement="Flow_00kky3k">
-        <di:waypoint x="3640" y="1045" />
-        <di:waypoint x="3640" y="412" />
-        <di:waypoint x="3535" y="412" />
+        <di:waypoint x="3690" y="1045" />
+        <di:waypoint x="3690" y="412" />
+        <di:waypoint x="3585" y="412" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="3648" y="726" width="15" height="14" />
+          <dc:Bounds x="3698" y="726" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0h96w9j_di" bpmnElement="Flow_0h96w9j">
-        <di:waypoint x="3665" y="1070" />
-        <di:waypoint x="3750" y="1070" />
-        <di:waypoint x="3750" y="600" />
-        <di:waypoint x="3820" y="600" />
+        <di:waypoint x="3715" y="1070" />
+        <di:waypoint x="3800" y="1070" />
+        <di:waypoint x="3800" y="600" />
+        <di:waypoint x="3870" y="600" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="3756" y="832" width="18" height="14" />
+          <dc:Bounds x="3806" y="832" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_053ca95_di" bpmnElement="Flow_053ca95">
-        <di:waypoint x="3920" y="600" />
         <di:waypoint x="3970" y="600" />
+        <di:waypoint x="4020" y="600" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0p6vvu0_di" bpmnElement="Flow_0p6vvu0">
         <di:waypoint x="1770" y="600" />
@@ -1001,17 +1001,17 @@ temp_test = invoice["invoiceStatus"]
         <dc:Bounds x="1480" y="1180" width="370" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Participant_1qabwrg_di" bpmnElement="Participant_1qabwrg" isHorizontal="true">
-        <dc:Bounds x="1890" y="1180" width="459" height="80" />
+        <dc:Bounds x="1890" y="1180" width="509" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Participant_0b27sri_di" bpmnElement="Participant_0b27sri" isHorizontal="true">
-        <dc:Bounds x="3355" y="1160" width="537" height="80" />
+        <dc:Bounds x="3405" y="1160" width="537" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="TextAnnotation_1uaw1w7_di" bpmnElement="TextAnnotation_1uaw1w7">
         <dc:Bounds x="640" y="-170" width="580" height="30" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="DataOutputAssociation_0qbdnmg_di" bpmnElement="DataOutputAssociation_0qbdnmg">
-        <di:waypoint x="2341" y="482" />
-        <di:waypoint x="2377" y="415" />
+        <di:waypoint x="2391" y="482" />
+        <di:waypoint x="2427" y="415" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Association_1eygti7_di" bpmnElement="Association_1eygti7">
         <di:waypoint x="906" y="-70" />
@@ -1026,12 +1026,12 @@ temp_test = invoice["invoiceStatus"]
         <di:waypoint x="1930" y="1180" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0jciftq_di" bpmnElement="Flow_0jciftq">
-        <di:waypoint x="2310" y="482" />
-        <di:waypoint x="2310" y="150" />
+        <di:waypoint x="2360" y="482" />
+        <di:waypoint x="2360" y="150" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0p0bc5u_di" bpmnElement="Flow_0p0bc5u">
-        <di:waypoint x="3870" y="640" />
-        <di:waypoint x="3870" y="1160" />
+        <di:waypoint x="3920" y="640" />
+        <di:waypoint x="3920" y="1160" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0n9qxyw_di" bpmnElement="Flow_0n9qxyw">
         <di:waypoint x="1010" y="482" />
@@ -1041,16 +1041,16 @@ temp_test = invoice["invoiceStatus"]
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1getkzr_di" bpmnElement="Flow_1getkzr">
-        <di:waypoint x="3510" y="260" />
-        <di:waypoint x="3510" y="150" />
+        <di:waypoint x="3560" y="260" />
+        <di:waypoint x="3560" y="150" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0ozze4c_di" bpmnElement="Flow_0ozze4c">
-        <di:waypoint x="3210" y="898" />
-        <di:waypoint x="3210" y="150" />
+        <di:waypoint x="3260" y="898" />
+        <di:waypoint x="3260" y="150" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1dgkwzr_di" bpmnElement="Flow_1dgkwzr">
-        <di:waypoint x="4020" y="560" />
-        <di:waypoint x="4020" y="150" />
+        <di:waypoint x="4070" y="560" />
+        <di:waypoint x="4070" y="150" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>