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 d26e0d04..468a6c63 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
@@ -35,7 +35,6 @@
         <bpmn:flowNodeRef>Gateway_0wk5se9</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_show_errors</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_10p5t0r</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_0twki30</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_0dqj39f</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_07oyzdx</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_15y55nw</bpmn:flowNodeRef>
@@ -64,6 +63,7 @@
         <bpmn:flowNodeRef>Activity_0gkpa9s</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0gkejaj</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Waku_Message_Pending_Payment</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0twki30</bpmn:flowNodeRef>
       </bpmn:lane>
       <bpmn:lane id="Lane_1b7abal" name="Project Lead">
         <bpmn:flowNodeRef>Activity_1t8wi0r</bpmn:flowNodeRef>
@@ -246,21 +246,6 @@ isCurTest = False</spiffworkflow:preScript>
       <bpmn:incoming>Flow_1x4rtop</bpmn:incoming>
       <bpmn:outgoing>Flow_06amgv2</bpmn:outgoing>
     </bpmn:callActivity>
-    <bpmn:scriptTask id="Activity_0twki30" name="Clear Field(s) That Failed Validation">
-      <bpmn:incoming>Flow_18cic3h</bpmn:incoming>
-      <bpmn:outgoing>Flow_1pefcgv</bpmn:outgoing>
-      <bpmn:script># CLear Contributor Name if contains number
-if svc_is_num_in_name:
-    invoice["contributorName"] = None
-
-# Clear Invoice Anount if more than 2 decimals
-if svc_decimal_cnt &gt; 2:
-    invoice["invoiceAmount"] = None
-
-# Clear Invocie Due Date if before Today's Date
-if not(svc_is_due_date_after):
-    invoice["dueDate"] = None</bpmn:script>
-    </bpmn:scriptTask>
     <bpmn:exclusiveGateway id="Gateway_0dqj39f" name="Submit?" default="Flow_1xvt99y">
       <bpmn:incoming>Flow_0z51hpb</bpmn:incoming>
       <bpmn:outgoing>Flow_1xvt99y</bpmn:outgoing>
@@ -452,7 +437,7 @@ else:
       <bpmn:incoming>Flow_0hrln7l</bpmn:incoming>
       <bpmn:outgoing>Flow_14glsqd</bpmn:outgoing>
     </bpmn:intermediateThrowEvent>
-    <bpmn:scriptTask id="Delete_File" name="Delete File">
+    <bpmn:scriptTask id="Delete_File" name="Delete File from memory">
       <bpmn:incoming>Flow_0a9w301</bpmn:incoming>
       <bpmn:outgoing>Flow_0cj1m0h</bpmn:outgoing>
       <bpmn:script>del(filesAccept)</bpmn:script>
@@ -466,8 +451,6 @@ else:
       <bpmn:incoming>Flow_0hws1pe</bpmn:incoming>
       <bpmn:incoming>Flow_0n6znyl</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:dataObjectReference id="DataObjectReference_0br9o6c" name="wr_invoicePayPend" dataObjectRef="wr_invoicePayPend" />
-    <bpmn:dataObject id="wr_invoicePayPend" />
     <bpmn:intermediateThrowEvent id="Event_0lhkxwc" name="Approved and Awaiting Payment">
       <bpmn:incoming>Flow_1cwebky</bpmn:incoming>
       <bpmn:outgoing>Flow_0n6znyl</bpmn:outgoing>
@@ -522,14 +505,14 @@ ___
         <bpmn:targetRef>DataObjectReference_1g4gzsx</bpmn:targetRef>
       </bpmn:dataOutputAssociation>
     </bpmn:serviceTask>
-    <bpmn:intermediateCatchEvent id="Event_1vi3um1" name="Temp Fix">
+    <bpmn:intermediateCatchEvent id="Event_1vi3um1" name="Redirect">
       <bpmn:incoming>Flow_1xvt99y</bpmn:incoming>
       <bpmn:outgoing>Flow_0hrln7l</bpmn:outgoing>
       <bpmn:timerEventDefinition id="TimerEventDefinition_1wiimzf">
         <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">timedelta(seconds=1)</bpmn:timeDuration>
       </bpmn:timerEventDefinition>
     </bpmn:intermediateCatchEvent>
-    <bpmn:intermediateCatchEvent id="Event_0rwxlca" name="Temp Fix">
+    <bpmn:intermediateCatchEvent id="Event_0rwxlca" name="Redirect">
       <bpmn:incoming>Flow_1qf14hx</bpmn:incoming>
       <bpmn:outgoing>Flow_1xo0lvm</bpmn:outgoing>
       <bpmn:timerEventDefinition id="TimerEventDefinition_1jblyi5">
@@ -1070,6 +1053,11 @@ isCurTest = False</bpmn:script>
 invoice["invoiceStatus"] = "Approved and Pending Payment"</spiffworkflow:preScript>
       </bpmn:extensionElements>
       <bpmn:outgoing>Flow_0hws1pe</bpmn:outgoing>
+      <bpmn:property id="Property_1hsvamz" name="__targetRef_placeholder" />
+      <bpmn:dataInputAssociation id="DataInputAssociation_0grqn1l">
+        <bpmn:sourceRef>DataObjectReference_0br9o6c</bpmn:sourceRef>
+        <bpmn:targetRef>Property_1hsvamz</bpmn:targetRef>
+      </bpmn:dataInputAssociation>
       <bpmn:startEvent id="Waku_Message_Pending_Payment_Start_Event">
         <bpmn:outgoing>Flow_1j5eznh</bpmn:outgoing>
       </bpmn:startEvent>
@@ -1113,6 +1101,23 @@ timezone = current_user_extras["time_zone"]</spiffworkflow:preScript>
       <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="Get_Waku_Messages_Message" />
     </bpmn:subProcess>
+    <bpmn:scriptTask id="Activity_0twki30" name="Clear Field(s) That Failed Validation">
+      <bpmn:incoming>Flow_18cic3h</bpmn:incoming>
+      <bpmn:outgoing>Flow_1pefcgv</bpmn:outgoing>
+      <bpmn:script># CLear Contributor Name if contains number
+if svc_is_num_in_name:
+    invoice["contributorName"] = None
+
+# Clear Invoice Anount if more than 2 decimals
+if svc_decimal_cnt &gt; 2:
+    invoice["invoiceAmount"] = None
+
+# Clear Invocie Due Date if before Today's Date
+if not(svc_is_due_date_after):
+    invoice["dueDate"] = None</bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:dataObjectReference id="DataObjectReference_0br9o6c" name="wr_invoicePayPend" dataObjectRef="wr_invoicePayPend" />
+    <bpmn:dataObject id="wr_invoicePayPend" />
   </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" />
@@ -1205,9 +1210,6 @@ timezone = current_user_extras["time_zone"]</spiffworkflow:preScript>
         <dc:Bounds x="1660" y="492" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_14mudmu_di" bpmnElement="Activity_0twki30">
-        <dc:Bounds x="1190" y="330" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_0dqj39f_di" bpmnElement="Gateway_0dqj39f" isMarkerVisible="true">
         <dc:Bounds x="2005" y="507" width="50" height="50" />
         <bpmndi:BPMNLabel>
@@ -1304,11 +1306,12 @@ timezone = current_user_extras["time_zone"]</spiffworkflow:preScript>
       <bpmndi:BPMNShape id="Event_176ch98_di" bpmnElement="Event_176ch98">
         <dc:Bounds x="2262" y="514" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2250" y="557" width="79" height="27" />
+          <dc:Bounds x="2240" y="557" width="79" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0nqyv3k_di" bpmnElement="Delete_File">
         <dc:Bounds x="2890" y="490" width="100" height="80" />
+        <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_1ytq6m7_di" bpmnElement="Gateway_1ytq6m7" isMarkerVisible="true">
         <dc:Bounds x="4365" y="1055" width="50" height="50" />
@@ -1319,12 +1322,6 @@ timezone = current_user_extras["time_zone"]</spiffworkflow:preScript>
       <bpmndi:BPMNShape id="Event_1usbnt0_di" bpmnElement="Event_1usbnt0">
         <dc:Bounds x="5152" y="592" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="DataObjectReference_0br9o6c_di" bpmnElement="DataObjectReference_0br9o6c">
-        <dc:Bounds x="4942" y="715" width="36" height="50" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="4918" y="761" width="85" height="27" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0lhkxwc_di" bpmnElement="Event_0lhkxwc">
         <dc:Bounds x="4842" y="592" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -1347,18 +1344,27 @@ timezone = current_user_extras["time_zone"]</spiffworkflow:preScript>
       <bpmndi:BPMNShape id="Event_0tb3bpb_di" bpmnElement="Event_1vi3um1">
         <dc:Bounds x="2152" y="514" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="2149" y="557" width="45" height="14" />
+          <dc:Bounds x="2151" y="557" width="41" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_09tmh4n_di" bpmnElement="Event_0rwxlca">
         <dc:Bounds x="4012" y="682" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="3951" y="693" width="45" height="14" />
+          <dc:Bounds x="3959" y="693" width="41" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_00w2hg5_di" bpmnElement="Event_1simh9k">
         <dc:Bounds x="4272" y="1062" width="36" height="36" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_14mudmu_di" bpmnElement="Activity_0twki30">
+        <dc:Bounds x="1165" y="330" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="DataObjectReference_0br9o6c_di" bpmnElement="DataObjectReference_0br9o6c">
+        <dc:Bounds x="4862" y="495" width="36" height="50" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="4838" y="541" width="85" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0z13hw3_di" bpmnElement="SubProcess_Data_validation_rules">
         <dc:Bounds x="1350" y="492" width="100" height="80" />
         <bpmndi:BPMNLabel />
@@ -1458,7 +1464,7 @@ timezone = current_user_extras["time_zone"]</spiffworkflow:preScript>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_18cic3h_di" bpmnElement="Flow_18cic3h">
         <di:waypoint x="1350" y="370" />
-        <di:waypoint x="1290" y="370" />
+        <di:waypoint x="1265" y="370" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_02moyg7_di" bpmnElement="Flow_02moyg7">
         <di:waypoint x="1265" y="532" />
@@ -1558,7 +1564,7 @@ timezone = current_user_extras["time_zone"]</spiffworkflow:preScript>
         <di:waypoint x="1165" y="532" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1pefcgv_di" bpmnElement="Flow_1pefcgv">
-        <di:waypoint x="1190" y="370" />
+        <di:waypoint x="1165" y="370" />
         <di:waypoint x="1070" y="370" />
         <di:waypoint x="1070" y="507" />
       </bpmndi:BPMNEdge>
@@ -1717,6 +1723,10 @@ timezone = current_user_extras["time_zone"]</spiffworkflow:preScript>
         <di:waypoint x="3359" y="1290" />
         <di:waypoint x="3359" y="570" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="DataInputAssociation_0grqn1l_di" bpmnElement="DataInputAssociation_0grqn1l">
+        <di:waypoint x="4898" y="520" />
+        <di:waypoint x="4970" y="520" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
   <bpmndi:BPMNDiagram>