diff --git a/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/cc-invoice-approval-process-v2.bpmn b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/cc-invoice-approval-process-v2.bpmn
index 965d8abf..4e2230ab 100644
--- a/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/cc-invoice-approval-process-v2.bpmn
+++ b/manage-procurement/procurement/core-contributor-invoice-management/cc-invoice-approval/cc-invoice-approval-process-v2.bpmn
@@ -1068,9 +1068,19 @@ invoice["invoiceStatus"] = "Approved and Pending Payment"</spiffworkflow:preScri
       </bpmn:startEvent>
       <bpmn:callActivity id="Get_Waku_Messages_Message" name="Get Waku Messages: Message" calledElement="Waku_Messages_Message">
         <bpmn:extensionElements>
-          <spiffworkflow:preScript />
+          <spiffworkflow:preScript># Set Task Id
+if isMatch:
+    task_id = "waku_payment_pending_ismatch"
+else:
+    task_id = "waku_payment_pending_not_ismatch"
+
+# Set Message in Call Activity
+isSetMessage = True
+
+# Set Time Zone
+timezone = current_user_extras["time_zone"]</spiffworkflow:preScript>
         </bpmn:extensionElements>
-        <bpmn:incoming>Flow_1s45y9i</bpmn:incoming>
+        <bpmn:incoming>Flow_1j5eznh</bpmn:incoming>
         <bpmn:outgoing>Flow_1w7kqay</bpmn:outgoing>
       </bpmn:callActivity>
       <bpmn:sequenceFlow id="Flow_1w7kqay" sourceRef="Get_Waku_Messages_Message" targetRef="waku_payment_pending" />
@@ -1092,23 +1102,7 @@ invoice["invoiceStatus"] = "Approved and Pending Payment"</spiffworkflow:preScri
         <bpmn:outgoing>Flow_1buk0a2</bpmn:outgoing>
       </bpmn:serviceTask>
       <bpmn:sequenceFlow id="Flow_1buk0a2" sourceRef="waku_payment_pending" targetRef="Waku_Message_Pending_Payment_End_Event" />
-      <bpmn:sequenceFlow id="Flow_1j5eznh" sourceRef="Waku_Message_Pending_Payment_Start_Event" targetRef="Activity_0dqsc58" />
-      <bpmn:sequenceFlow id="Flow_1s45y9i" sourceRef="Activity_0dqsc58" targetRef="Get_Waku_Messages_Message" />
-      <bpmn:scriptTask id="Activity_0dqsc58" name="Temp Pre-Script">
-        <bpmn:incoming>Flow_1j5eznh</bpmn:incoming>
-        <bpmn:outgoing>Flow_1s45y9i</bpmn:outgoing>
-        <bpmn:script># Set Task Id
-if isMatch:
-    task_id = "waku_payment_pending_ismatch"
-else:
-    task_id = "waku_payment_pending_not_ismatch"
-
-# Set Message in Call Activity
-isSetMessage = True
-
-# Set Time Zone
-timezone = current_user_extras["time_zone"]</bpmn:script>
-      </bpmn:scriptTask>
+      <bpmn:sequenceFlow id="Flow_1j5eznh" sourceRef="Waku_Message_Pending_Payment_Start_Event" targetRef="Get_Waku_Messages_Message" />
     </bpmn:subProcess>
     <bpmn:boundaryEvent id="Event_09q0ym0" name="5 days" attachedToRef="Activity_06b32ar">
       <bpmn:outgoing>Flow_1v8dszb</bpmn:outgoing>
@@ -1690,6 +1684,10 @@ timezone = current_user_extras["time_zone"]</bpmn:script>
         <di:waypoint x="3148" y="490" />
         <di:waypoint x="3218" y="395" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="DataOutputAssociation_1725g5y_di" bpmnElement="DataOutputAssociation_1725g5y">
+        <di:waypoint x="5000" y="650" />
+        <di:waypoint x="4968" y="715" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Association_1eygti7_di" bpmnElement="Association_1eygti7">
         <di:waypoint x="1169" y="-70" />
         <di:waypoint x="1167" y="-140" />
@@ -1722,10 +1720,6 @@ timezone = current_user_extras["time_zone"]</bpmn:script>
         <di:waypoint x="3359" y="1290" />
         <di:waypoint x="3359" y="570" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="DataOutputAssociation_1725g5y_di" bpmnElement="DataOutputAssociation_1725g5y">
-        <di:waypoint x="5000" y="650" />
-        <di:waypoint x="4968" y="715" />
-      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
   <bpmndi:BPMNDiagram>
@@ -1936,9 +1930,6 @@ timezone = current_user_extras["time_zone"]</bpmn:script>
   </bpmndi:BPMNDiagram>
   <bpmndi:BPMNDiagram id="BPMNDiagram_03yq39k">
     <bpmndi:BPMNPlane id="BPMNPlane_19vekoo" bpmnElement="Waku_Message_Pending_Payment">
-      <bpmndi:BPMNShape id="Event_13cibxi_di" bpmnElement="Waku_Message_Pending_Payment_Start_Event">
-        <dc:Bounds x="72" y="162" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0848qfu_di" bpmnElement="Get_Waku_Messages_Message">
         <dc:Bounds x="340" y="140" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -1950,8 +1941,8 @@ timezone = current_user_extras["time_zone"]</bpmn:script>
         <dc:Bounds x="530" y="140" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0pbd33y_di" bpmnElement="Activity_0dqsc58">
-        <dc:Bounds x="170" y="140" width="100" height="80" />
+      <bpmndi:BPMNShape id="Event_13cibxi_di" bpmnElement="Waku_Message_Pending_Payment_Start_Event">
+        <dc:Bounds x="222" y="162" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_1w7kqay_di" bpmnElement="Flow_1w7kqay">
         <di:waypoint x="440" y="180" />
@@ -1962,11 +1953,7 @@ timezone = current_user_extras["time_zone"]</bpmn:script>
         <di:waypoint x="702" y="180" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1j5eznh_di" bpmnElement="Flow_1j5eznh">
-        <di:waypoint x="108" y="180" />
-        <di:waypoint x="170" y="180" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1s45y9i_di" bpmnElement="Flow_1s45y9i">
-        <di:waypoint x="270" y="180" />
+        <di:waypoint x="258" y="180" />
         <di:waypoint x="340" y="180" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>