diff --git a/misc/category_number_one/multiple-approvals/multi-approvals-1.bpmn b/misc/category_number_one/multiple-approvals/multi-approvals-1.bpmn
index e3f217ed..2d8c24b1 100644
--- a/misc/category_number_one/multiple-approvals/multi-approvals-1.bpmn
+++ b/misc/category_number_one/multiple-approvals/multi-approvals-1.bpmn
@@ -83,15 +83,15 @@ lane_owners = {
     <bpmn:manualTask id="Activity_1vdzcey" name="Do Approver-3 Approval">
       <bpmn:incoming>Flow_12x4km2</bpmn:incoming>
       <bpmn:outgoing>Flow_069391w</bpmn:outgoing>
+      <bpmn:property id="Property_18ra54e" name="__targetRef_placeholder" />
+      <bpmn:dataInputAssociation id="DataInputAssociation_1ujv32m">
+        <bpmn:sourceRef>DataObjectReference_10v9kb5</bpmn:sourceRef>
+        <bpmn:targetRef>Property_18ra54e</bpmn:targetRef>
+      </bpmn:dataInputAssociation>
     </bpmn:manualTask>
     <bpmn:scriptTask id="Activity_0ht3rzf" name="Set Lead Approval">
       <bpmn:incoming>Flow_069391w</bpmn:incoming>
       <bpmn:outgoing>Flow_00akfhi</bpmn:outgoing>
-      <bpmn:property id="Property_098tqzt" name="__targetRef_placeholder" />
-      <bpmn:dataInputAssociation id="DataInputAssociation_1ujv32m">
-        <bpmn:sourceRef>DataObjectReference_10v9kb5</bpmn:sourceRef>
-        <bpmn:targetRef>Property_098tqzt</bpmn:targetRef>
-      </bpmn:dataInputAssociation>
       <bpmn:dataOutputAssociation id="DataOutputAssociation_17bvaeq">
         <bpmn:targetRef>DataObjectReference_10v9kb5</bpmn:targetRef>
       </bpmn:dataOutputAssociation>
@@ -114,6 +114,11 @@ is_approver3_approval = True</bpmn:script>
     <bpmn:manualTask id="Activity_0649vw3" name="Do Approver-2 Approval">
       <bpmn:incoming>Flow_14bzyyu</bpmn:incoming>
       <bpmn:outgoing>Flow_1ps311c</bpmn:outgoing>
+      <bpmn:property id="Property_0rsan3u" name="__targetRef_placeholder" />
+      <bpmn:dataInputAssociation id="DataInputAssociation_12lsybg">
+        <bpmn:sourceRef>DataObjectReference_1r531et</bpmn:sourceRef>
+        <bpmn:targetRef>Property_0rsan3u</bpmn:targetRef>
+      </bpmn:dataInputAssociation>
     </bpmn:manualTask>
     <bpmn:boundaryEvent id="Event_092hc6t" attachedToRef="Activity_0649vw3">
       <bpmn:outgoing>Flow_1i7dm9k</bpmn:outgoing>
@@ -125,15 +130,15 @@ is_approver3_approval = True</bpmn:script>
     <bpmn:manualTask id="Activity_02qvs11" name="Do Approver-1 Approval">
       <bpmn:incoming>Flow_065h60y</bpmn:incoming>
       <bpmn:outgoing>Flow_0lsgj5x</bpmn:outgoing>
+      <bpmn:property id="Property_1r7dbqm" name="__targetRef_placeholder" />
+      <bpmn:dataInputAssociation id="DataInputAssociation_1nl5d0v">
+        <bpmn:sourceRef>DataObjectReference_16tbebh</bpmn:sourceRef>
+        <bpmn:targetRef>Property_1r7dbqm</bpmn:targetRef>
+      </bpmn:dataInputAssociation>
     </bpmn:manualTask>
     <bpmn:scriptTask id="Activity_0np7jlr" name="Set Core Approval">
       <bpmn:incoming>Flow_0lsgj5x</bpmn:incoming>
       <bpmn:outgoing>Flow_1crkrzw</bpmn:outgoing>
-      <bpmn:property id="Property_0trh1ya" name="__targetRef_placeholder" />
-      <bpmn:dataInputAssociation id="DataInputAssociation_1nl5d0v">
-        <bpmn:sourceRef>DataObjectReference_16tbebh</bpmn:sourceRef>
-        <bpmn:targetRef>Property_0trh1ya</bpmn:targetRef>
-      </bpmn:dataInputAssociation>
       <bpmn:dataOutputAssociation id="DataOutputAssociation_1kg2e1u">
         <bpmn:targetRef>DataObjectReference_16tbebh</bpmn:targetRef>
       </bpmn:dataOutputAssociation>
@@ -156,11 +161,6 @@ is_approver1_approval = True</bpmn:script>
     <bpmn:scriptTask id="Activity_02y3rqp" name="Set Fin Approval">
       <bpmn:incoming>Flow_1ps311c</bpmn:incoming>
       <bpmn:outgoing>Flow_0c7ey0f</bpmn:outgoing>
-      <bpmn:property id="Property_1q9n2e5" name="__targetRef_placeholder" />
-      <bpmn:dataInputAssociation id="DataInputAssociation_12lsybg">
-        <bpmn:sourceRef>DataObjectReference_1r531et</bpmn:sourceRef>
-        <bpmn:targetRef>Property_1q9n2e5</bpmn:targetRef>
-      </bpmn:dataInputAssociation>
       <bpmn:dataOutputAssociation id="DataOutputAssociation_1451gxf">
         <bpmn:targetRef>DataObjectReference_1r531et</bpmn:targetRef>
       </bpmn:dataOutputAssociation>
@@ -575,24 +575,24 @@ Approval Count: {{ approval_cnt }}
         <di:waypoint x="188" y="285" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="DataInputAssociation_1ujv32m_di" bpmnElement="DataInputAssociation_1ujv32m">
-        <di:waypoint x="712" y="1095" />
-        <di:waypoint x="693" y="1150" />
+        <di:waypoint x="702" y="1083" />
+        <di:waypoint x="605" y="1150" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="DataOutputAssociation_17bvaeq_di" bpmnElement="DataOutputAssociation_17bvaeq">
         <di:waypoint x="740" y="1150" />
         <di:waypoint x="726" y="1095" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="DataInputAssociation_1nl5d0v_di" bpmnElement="DataInputAssociation_1nl5d0v">
-        <di:waypoint x="715" y="495" />
-        <di:waypoint x="702" y="550" />
+        <di:waypoint x="702" y="483" />
+        <di:waypoint x="605" y="550" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="DataOutputAssociation_1kg2e1u_di" bpmnElement="DataOutputAssociation_1kg2e1u">
         <di:waypoint x="740" y="550" />
         <di:waypoint x="726" y="495" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="DataInputAssociation_12lsybg_di" bpmnElement="DataInputAssociation_12lsybg">
-        <di:waypoint x="729" y="795" />
-        <di:waypoint x="710" y="840" />
+        <di:waypoint x="722" y="780" />
+        <di:waypoint x="610" y="840" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="DataOutputAssociation_1451gxf_di" bpmnElement="DataOutputAssociation_1451gxf">
         <di:waypoint x="740" y="840" />