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 ad20511e..f761c28b 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
@@ -706,7 +706,7 @@ else:
       <bpmn:startEvent id="Event_0ialhor">
         <bpmn:outgoing>Flow_14x1v12</bpmn:outgoing>
       </bpmn:startEvent>
-      <bpmn:callActivity id="Activity_0eh4so1" name="Call Waku Messages: Message Body" calledElement="Waku_Messages_Message_Body">
+      <bpmn:callActivity id="Activity_0eh4so1" name="Call Waku Messages: Message" calledElement="Waku_Messages_Message">
         <bpmn:extensionElements>
           <spiffworkflow:preScript>task_id = "waku_invoice_submitted"</spiffworkflow:preScript>
         </bpmn:extensionElements>
@@ -729,14 +729,9 @@ else:
         <bpmn:incoming>Flow_1d0phao</bpmn:incoming>
         <bpmn:outgoing>Flow_01i59kw</bpmn:outgoing>
       </bpmn:serviceTask>
-      <bpmn:callActivity id="Activity_1e88apc" name="Call Waku Messages: Message Variables" calledElement="Waku_Messages_Message_Variables">
-        <bpmn:incoming>Flow_1wq6gzs</bpmn:incoming>
-        <bpmn:outgoing>Flow_01qooso</bpmn:outgoing>
-      </bpmn:callActivity>
       <bpmn:sequenceFlow id="Flow_14x1v12" sourceRef="Event_0ialhor" targetRef="Activity_04kw0jc" />
-      <bpmn:sequenceFlow id="Flow_1wq6gzs" sourceRef="Activity_0eh4so1" targetRef="Activity_1e88apc" />
+      <bpmn:sequenceFlow id="Flow_1wq6gzs" sourceRef="Activity_0eh4so1" targetRef="Activity_03duc95" />
       <bpmn:sequenceFlow id="Flow_01i59kw" sourceRef="waku_invoice_rejected" targetRef="Event_0ihhn4w" />
-      <bpmn:sequenceFlow id="Flow_01qooso" sourceRef="Activity_1e88apc" targetRef="Activity_03duc95" />
       <bpmn:sequenceFlow id="Flow_0umhf4u" sourceRef="Activity_04kw0jc" targetRef="Activity_0eh4so1" />
       <bpmn:scriptTask id="Activity_04kw0jc" name="Set Which Message" scriptFormat="python">
         <bpmn:incoming>Flow_14x1v12</bpmn:incoming>
@@ -752,7 +747,7 @@ isSetMessage = False</bpmn:script>
       </bpmn:scriptTask>
       <bpmn:sequenceFlow id="Flow_1d0phao" sourceRef="Activity_03duc95" targetRef="waku_invoice_rejected" />
       <bpmn:scriptTask id="Activity_03duc95" name="Set Message" scriptFormat="python">
-        <bpmn:incoming>Flow_01qooso</bpmn:incoming>
+        <bpmn:incoming>Flow_1wq6gzs</bpmn:incoming>
         <bpmn:outgoing>Flow_1d0phao</bpmn:outgoing>
         <bpmn:script># Set who rejected
 if not(invoice.isTeamLeadApprove):
@@ -1564,22 +1559,18 @@ else:
         <dc:Bounds x="250" y="180" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_06ie9hh" bpmnElement="Event_0ihhn4w">
-        <dc:Bounds x="922" y="202" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1lk7fz8" bpmnElement="waku_invoice_rejected">
-        <dc:Bounds x="760" y="180" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0t7nhr7" bpmnElement="Activity_1e88apc">
-        <dc:Bounds x="410" y="180" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0py9spx_di" bpmnElement="Activity_04kw0jc">
         <dc:Bounds x="70" y="180" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_06ie9hh" bpmnElement="Event_0ihhn4w">
+        <dc:Bounds x="762" y="202" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1lk7fz8" bpmnElement="waku_invoice_rejected">
+        <dc:Bounds x="600" y="180" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_08c60j8_di" bpmnElement="Activity_03duc95">
-        <dc:Bounds x="590" y="180" width="100" height="80" />
+        <dc:Bounds x="430" y="180" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_04mzj46" bpmnElement="Flow_14x1v12">
         <di:waypoint x="-2" y="220" />
@@ -1587,23 +1578,19 @@ else:
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_0j3b6zk" bpmnElement="Flow_1wq6gzs">
         <di:waypoint x="350" y="220" />
-        <di:waypoint x="410" y="220" />
+        <di:waypoint x="430" y="220" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_16ht4ok" bpmnElement="Flow_01i59kw">
-        <di:waypoint x="860" y="220" />
-        <di:waypoint x="922" y="220" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_01vg97v" bpmnElement="Flow_01qooso">
-        <di:waypoint x="510" y="220" />
-        <di:waypoint x="590" y="220" />
+        <di:waypoint x="700" y="220" />
+        <di:waypoint x="762" y="220" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0umhf4u_di" bpmnElement="Flow_0umhf4u">
         <di:waypoint x="170" y="220" />
         <di:waypoint x="250" y="220" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1d0phao_di" bpmnElement="Flow_1d0phao">
-        <di:waypoint x="690" y="220" />
-        <di:waypoint x="760" y="220" />
+        <di:waypoint x="530" y="220" />
+        <di:waypoint x="600" y="220" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>