diff --git a/camunda-h2-database.mv.db b/camunda-h2-database.mv.db
index 3d76dcdc2f8a11c8f603ad1c7f593b316713c4b1..7b5f31083eb0d092e9ac97919fd871526a1ef3a4 100644
Binary files a/camunda-h2-database.mv.db and b/camunda-h2-database.mv.db differ
diff --git a/target/classes/ticketingSystem.bpmn b/target/classes/ticketingSystem.bpmn
index 4281f204264b354ec0090967aaec5be28e5f1695..613004215803948b43f437fed08dc4825ea7e2cb 100644
--- a/target/classes/ticketingSystem.bpmn
+++ b/target/classes/ticketingSystem.bpmn
@@ -10,50 +10,50 @@
         <bpmn:flowNodeRef>Event_1shf0vj</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0thir9e</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1o9ilqe</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Event_0no3gpy</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0noqt28</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_1qr2num</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_02r4dq9</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1hwkdhf</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Event_0uxq9pi</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_1gvbw22</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1w98vn8</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Event_0uxq9pi</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Event_0no3gpy</bpmn:flowNodeRef>
       </bpmn:lane>
-      <bpmn:lane id="Lane_1qts4jt">
+      <bpmn:lane id="Lane_1qts4jt" name="Ticket Resolver">
         <bpmn:flowNodeRef>Activity_1vxrxea</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0xtx6b9</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_15ef31e</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_0cgg53i</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1cn408k</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Event_1gey1o9</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_00dooxn</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0k8xiy0</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_12tgqau</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_0pko5ob</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_1tlf84b</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_1ayanvw</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_01xjsm6</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Gateway_11mlb7e</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_1tlf84b</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_0cgg53i</bpmn:flowNodeRef>
         <bpmn:flowNodeRef>Activity_1ype7pt</bpmn:flowNodeRef>
-        <bpmn:flowNodeRef>Activity_1ayanvw</bpmn:flowNodeRef>
+        <bpmn:flowNodeRef>Activity_12tgqau</bpmn:flowNodeRef>
         <bpmn:childLaneSet id="LaneSet_1xmtgh3">
-          <bpmn:lane id="Lane_06erfpa" name="system">
+          <bpmn:lane id="Lane_06erfpa" name="IT system">
             <bpmn:flowNodeRef>Activity_1vxrxea</bpmn:flowNodeRef>
             <bpmn:flowNodeRef>Activity_0xtx6b9</bpmn:flowNodeRef>
             <bpmn:flowNodeRef>Activity_15ef31e</bpmn:flowNodeRef>
-            <bpmn:flowNodeRef>Activity_0cgg53i</bpmn:flowNodeRef>
             <bpmn:flowNodeRef>Activity_1cn408k</bpmn:flowNodeRef>
             <bpmn:flowNodeRef>Event_1gey1o9</bpmn:flowNodeRef>
             <bpmn:flowNodeRef>Activity_0pko5ob</bpmn:flowNodeRef>
             <bpmn:flowNodeRef>Activity_1tlf84b</bpmn:flowNodeRef>
-            <bpmn:flowNodeRef>Activity_1ype7pt</bpmn:flowNodeRef>
             <bpmn:flowNodeRef>Activity_1ayanvw</bpmn:flowNodeRef>
+            <bpmn:flowNodeRef>Activity_01xjsm6</bpmn:flowNodeRef>
+            <bpmn:flowNodeRef>Activity_1ype7pt</bpmn:flowNodeRef>
           </bpmn:lane>
           <bpmn:lane id="Lane_1674bv3" name="IT department">
             <bpmn:flowNodeRef>Activity_00dooxn</bpmn:flowNodeRef>
             <bpmn:flowNodeRef>Activity_0k8xiy0</bpmn:flowNodeRef>
-            <bpmn:flowNodeRef>Activity_12tgqau</bpmn:flowNodeRef>
-            <bpmn:flowNodeRef>Activity_01xjsm6</bpmn:flowNodeRef>
             <bpmn:flowNodeRef>Gateway_11mlb7e</bpmn:flowNodeRef>
+            <bpmn:flowNodeRef>Activity_0cgg53i</bpmn:flowNodeRef>
+            <bpmn:flowNodeRef>Activity_12tgqau</bpmn:flowNodeRef>
           </bpmn:lane>
         </bpmn:childLaneSet>
       </bpmn:lane>
@@ -92,7 +92,7 @@
     <bpmn:sequenceFlow id="Flow_16tjsz1" sourceRef="Activity_1hwkdhf" targetRef="Activity_1cn408k" />
     <bpmn:sequenceFlow id="Flow_1v70uwg" sourceRef="Activity_1cn408k" targetRef="Event_1gey1o9" />
     <bpmn:sequenceFlow id="Flow_1sb09hm" name="No information given in time" sourceRef="Event_0uxq9pi" targetRef="Event_1shf0vj" />
-    <bpmn:sequenceFlow id="Flow_0hqlhza" name="No" sourceRef="Gateway_1gvbw22" targetRef="Activity_0k8xiy0">
+    <bpmn:sequenceFlow id="Flow_0hqlhza" name="No" sourceRef="Gateway_1gvbw22" targetRef="Activity_00dooxn">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"> #{completed==false}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:boundaryEvent id="Event_0uxq9pi" name="timer for 2 weeks" attachedToRef="Activity_1ktet4n">
@@ -129,20 +129,12 @@
       <bpmn:incoming>Flow_0raf3vq</bpmn:incoming>
       <bpmn:outgoing>Flow_1dixi6q</bpmn:outgoing>
     </bpmn:userTask>
-    <bpmn:startEvent id="Event_0no3gpy" name="IT Query">
-      <bpmn:outgoing>Flow_023e8ha</bpmn:outgoing>
-      <bpmn:outgoing>Flow_0zjcyq2</bpmn:outgoing>
-    </bpmn:startEvent>
     <bpmn:dataStoreReference id="DataStoreReference_0o5ees5" name="H2 database table called ticket_submission" />
     <bpmn:sequenceFlow id="Flow_1jw19ut" sourceRef="Activity_15ef31e" targetRef="Activity_0pko5ob" />
     <bpmn:userTask id="Activity_0noqt28" name="Is completed?" camunda:formKey="camunda-forms:/forms/completedIssue.form">
       <bpmn:incoming>Flow_12neab9</bpmn:incoming>
       <bpmn:outgoing>Flow_1a43g73</bpmn:outgoing>
     </bpmn:userTask>
-    <bpmn:userTask id="Activity_0cgg53i" name="Email Submissions" camunda:formKey="camunda-forms:/forms/EmailSubmissions.form">
-      <bpmn:incoming>Flow_0px1k4o</bpmn:incoming>
-      <bpmn:outgoing>Flow_0d9jstt</bpmn:outgoing>
-    </bpmn:userTask>
     <bpmn:sequenceFlow id="Flow_0d9jstt" sourceRef="Activity_0cgg53i" targetRef="Activity_0xtx6b9" />
     <bpmn:exclusiveGateway id="Gateway_1qr2num">
       <bpmn:incoming>Flow_059vfqu</bpmn:incoming>
@@ -169,28 +161,20 @@
     </bpmn:endEvent>
     <bpmn:userTask id="Activity_00dooxn" name="Ticket Assessment" camunda:formKey="camunda-forms:/forms/whoFix.form">
       <bpmn:incoming>Flow_19jvq5l</bpmn:incoming>
+      <bpmn:incoming>Flow_0hqlhza</bpmn:incoming>
       <bpmn:outgoing>Flow_05vrxvm</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:userTask id="Activity_0k8xiy0" name="Sufficient Info?" camunda:formKey="camunda-forms:/forms/suffInfo.form">
       <bpmn:incoming>Flow_05vrxvm</bpmn:incoming>
       <bpmn:incoming>Flow_0l776tb</bpmn:incoming>
-      <bpmn:incoming>Flow_0hqlhza</bpmn:incoming>
       <bpmn:outgoing>Flow_0c2qvip</bpmn:outgoing>
     </bpmn:userTask>
-    <bpmn:userTask id="Activity_12tgqau" name="Fix issue" camunda:formKey="camunda-forms:/forms/fixIssue.form">
-      <bpmn:incoming>Flow_0by2l4i</bpmn:incoming>
-      <bpmn:outgoing>Flow_12neab9</bpmn:outgoing>
-    </bpmn:userTask>
     <bpmn:sequenceFlow id="Flow_19jvq5l" sourceRef="Activity_0pko5ob" targetRef="Activity_00dooxn" />
     <bpmn:serviceTask id="Activity_0pko5ob" name="Update End User" camunda:delegateExpression="#{updateEndUserService}">
       <bpmn:incoming>Flow_1jw19ut</bpmn:incoming>
       <bpmn:outgoing>Flow_19jvq5l</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:sequenceFlow id="Flow_0by2l4i" sourceRef="Activity_01xjsm6" targetRef="Activity_12tgqau" />
-    <bpmn:serviceTask id="Activity_01xjsm6" name="Working on task Update" camunda:delegateExpression="#{ticketInProgressNotificationService}">
-      <bpmn:incoming>Flow_1drebew</bpmn:incoming>
-      <bpmn:outgoing>Flow_0by2l4i</bpmn:outgoing>
-    </bpmn:serviceTask>
     <bpmn:exclusiveGateway id="Gateway_1gvbw22">
       <bpmn:incoming>Flow_1a43g73</bpmn:incoming>
       <bpmn:outgoing>Flow_1ipq78m</bpmn:outgoing>
@@ -201,48 +185,77 @@
       <bpmn:outgoing>Flow_059vfqu</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:sequenceFlow id="Flow_0r90fgm" sourceRef="Activity_1tlf84b" targetRef="Activity_1w98vn8" />
-    <bpmn:exclusiveGateway id="Gateway_11mlb7e">
-      <bpmn:incoming>Flow_0c2qvip</bpmn:incoming>
-      <bpmn:outgoing>Flow_1drebew</bpmn:outgoing>
-      <bpmn:outgoing>Flow_0e4mjke</bpmn:outgoing>
-    </bpmn:exclusiveGateway>
     <bpmn:serviceTask id="Activity_1tlf84b" name="Update User ticket completion" camunda:delegateExpression="#{ticketResolvedNotificationService}">
       <bpmn:incoming>Flow_1ipq78m</bpmn:incoming>
       <bpmn:outgoing>Flow_0r90fgm</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:serviceTask id="Activity_1ype7pt" name="Recieve Email" camunda:delegateExpression="#{emailService}">
-      <bpmn:incoming>Flow_0zjcyq2</bpmn:incoming>
-      <bpmn:outgoing>Flow_0px1k4o</bpmn:outgoing>
-    </bpmn:serviceTask>
     <bpmn:sequenceFlow id="Flow_03qb6v9" sourceRef="Activity_1ayanvw" targetRef="Activity_1ktet4n" />
     <bpmn:serviceTask id="Activity_1ayanvw" name="Additional information needed" camunda:delegateExpression="#{requestMoreInfoNotificationService}">
       <bpmn:incoming>Flow_0e4mjke</bpmn:incoming>
       <bpmn:outgoing>Flow_03qb6v9</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:textAnnotation id="TextAnnotation_0zvon6n">
-      <bpmn:text>Estimate using SLA's parameters</bpmn:text>
+    <bpmn:serviceTask id="Activity_01xjsm6" name="Working on task Update" camunda:delegateExpression="#{ticketInProgressNotificationService}">
+      <bpmn:incoming>Flow_1drebew</bpmn:incoming>
+      <bpmn:outgoing>Flow_0by2l4i</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:exclusiveGateway id="Gateway_11mlb7e">
+      <bpmn:incoming>Flow_0c2qvip</bpmn:incoming>
+      <bpmn:outgoing>Flow_1drebew</bpmn:outgoing>
+      <bpmn:outgoing>Flow_0e4mjke</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:userTask id="Activity_0cgg53i" name="Email Submissions" camunda:formKey="camunda-forms:/forms/EmailSubmissions.form">
+      <bpmn:incoming>Flow_0px1k4o</bpmn:incoming>
+      <bpmn:outgoing>Flow_0d9jstt</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:serviceTask id="Activity_1ype7pt" name="Recieve Email" camunda:delegateExpression="#{emailService}">
+      <bpmn:incoming>Flow_0zjcyq2</bpmn:incoming>
+      <bpmn:outgoing>Flow_0px1k4o</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:startEvent id="Event_0no3gpy" name="IT Query">
+      <bpmn:outgoing>Flow_023e8ha</bpmn:outgoing>
+      <bpmn:outgoing>Flow_0zjcyq2</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:userTask id="Activity_12tgqau" name="Fix issue" camunda:formKey="camunda-forms:/forms/fixIssue.form">
+      <bpmn:incoming>Flow_0by2l4i</bpmn:incoming>
+      <bpmn:outgoing>Flow_12neab9</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:textAnnotation id="TextAnnotation_1bmwpf3">
+      <bpmn:text>Extends the issue description with both the original and the extended versions of information</bpmn:text>
     </bpmn:textAnnotation>
-    <bpmn:association id="Association_16o3e1c" sourceRef="Activity_0xtx6b9" targetRef="TextAnnotation_0zvon6n" />
+    <bpmn:association id="Association_0okn983" sourceRef="Activity_1vxrxea" targetRef="TextAnnotation_1bmwpf3" />
     <bpmn:textAnnotation id="TextAnnotation_0ddq4mh">
       <bpmn:text>The IT service Desk Manager assesses the ticket, assigns priority and effect, then decides which IT member the ticket belongs to</bpmn:text>
     </bpmn:textAnnotation>
     <bpmn:association id="Association_09u585y" sourceRef="Activity_00dooxn" targetRef="TextAnnotation_0ddq4mh" />
-    <bpmn:textAnnotation id="TextAnnotation_1bmwpf3">
-      <bpmn:text>Extends the issue description with both the original and the extended versions of information</bpmn:text>
+    <bpmn:textAnnotation id="TextAnnotation_13m72xh">
+      <bpmn:text>Email sent to let EndUser know their ticket is being worked on</bpmn:text>
     </bpmn:textAnnotation>
-    <bpmn:association id="Association_0okn983" sourceRef="Activity_1vxrxea" targetRef="TextAnnotation_1bmwpf3" />
+    <bpmn:association id="Association_0re1zef" sourceRef="Activity_01xjsm6" targetRef="TextAnnotation_13m72xh" />
+    <bpmn:textAnnotation id="TextAnnotation_15w8gjq">
+      <bpmn:text>EndUser is requested to login to web portal to give more info</bpmn:text>
+    </bpmn:textAnnotation>
+    <bpmn:association id="Association_0fa7l4r" sourceRef="Activity_1ayanvw" targetRef="TextAnnotation_15w8gjq" />
+    <bpmn:textAnnotation id="TextAnnotation_0zvon6n">
+      <bpmn:text>Estimate using SLA's parameters</bpmn:text>
+    </bpmn:textAnnotation>
+    <bpmn:association id="Association_16o3e1c" sourceRef="Activity_0xtx6b9" targetRef="TextAnnotation_0zvon6n" />
+    <bpmn:textAnnotation id="TextAnnotation_18zpava">
+      <bpmn:text>EndUser is updated about their ticket being submitted</bpmn:text>
+    </bpmn:textAnnotation>
+    <bpmn:association id="Association_0qtjopa" sourceRef="Activity_0pko5ob" targetRef="TextAnnotation_18zpava" />
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Collaboration_0eu38sb">
       <bpmndi:BPMNShape id="Participant_11oy18v_di" bpmnElement="Participant_11oy18v" isHorizontal="true">
-        <dc:Bounds x="115" y="82" width="1875" height="888" />
+        <dc:Bounds x="115" y="82" width="1875" height="868" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Lane_1qts4jt_di" bpmnElement="Lane_1qts4jt" isHorizontal="true">
-        <dc:Bounds x="145" y="380" width="1839" height="590" />
+        <dc:Bounds x="145" y="380" width="1839" height="570" />
+        <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Lane_1674bv3_di" bpmnElement="Lane_1674bv3" isHorizontal="true">
-        <dc:Bounds x="175" y="720" width="1809" height="250" />
+        <dc:Bounds x="175" y="720" width="1809" height="230" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Lane_06erfpa_di" bpmnElement="Lane_06erfpa" isHorizontal="true">
@@ -253,12 +266,28 @@
         <dc:Bounds x="145" y="82" width="1839" height="298" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="TextAnnotation_1bmwpf3_di" bpmnElement="TextAnnotation_1bmwpf3">
+        <dc:Bounds x="830" y="570" width="100" height="127" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="TextAnnotation_0ddq4mh_di" bpmnElement="TextAnnotation_0ddq4mh">
-        <dc:Bounds x="370" y="730" width="100" height="155" />
+        <dc:Bounds x="410" y="750" width="100" height="155" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="TextAnnotation_1bmwpf3_di" bpmnElement="TextAnnotation_1bmwpf3">
-        <dc:Bounds x="830" y="570" width="100" height="127" />
+      <bpmndi:BPMNShape id="TextAnnotation_13m72xh_di" bpmnElement="TextAnnotation_13m72xh">
+        <dc:Bounds x="1160" y="530" width="99.99156545209178" height="83.67071524966262" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="TextAnnotation_15w8gjq_di" bpmnElement="TextAnnotation_15w8gjq">
+        <dc:Bounds x="1030" y="390" width="99.99156545209178" height="83.67071524966262" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="TextAnnotation_0zvon6n_di" bpmnElement="TextAnnotation_0zvon6n">
+        <dc:Bounds x="630" y="310" width="100" height="55" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="TextAnnotation_18zpava_di" bpmnElement="TextAnnotation_18zpava">
+        <dc:Bounds x="400" y="599" width="99.99156545209178" height="70.17543859649123" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_13g0zpw_di" bpmnElement="Activity_1ktet4n">
@@ -289,12 +318,6 @@
         <dc:Bounds x="520" y="160" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_04yy7dz" bpmnElement="Event_0no3gpy">
-        <dc:Bounds x="232" y="182" width="36" height="36" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="229" y="152" width="44" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="DataStoreReference_0o5ees5_di" bpmnElement="DataStoreReference_0o5ees5">
         <dc:Bounds x="655" y="445" width="50" height="50" />
         <bpmndi:BPMNLabel>
@@ -304,10 +327,6 @@
       <bpmndi:BPMNShape id="Activity_036k7un_di" bpmnElement="Activity_0noqt28">
         <dc:Bounds x="1220" y="130" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_03k8d7b_di" bpmnElement="Activity_0cgg53i">
-        <dc:Bounds x="370" y="405" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_1qr2num_di" bpmnElement="Gateway_1qr2num" isMarkerVisible="true">
         <dc:Bounds x="1745" y="145" width="50" height="50" />
       </bpmndi:BPMNShape>
@@ -344,17 +363,10 @@
         <dc:Bounds x="753" y="820" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_16iw5vb" bpmnElement="Activity_12tgqau">
-        <dc:Bounds x="1220" y="750" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1ih7pn3_di" bpmnElement="Activity_0pko5ob">
         <dc:Bounds x="520" y="630" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0ycljh9_di" bpmnElement="Activity_01xjsm6">
-        <dc:Bounds x="1070" y="750" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_1gvbw22_di" bpmnElement="Gateway_1gvbw22" isMarkerVisible="true">
         <dc:Bounds x="1365" y="145" width="50" height="50" />
       </bpmndi:BPMNShape>
@@ -362,33 +374,62 @@
         <dc:Bounds x="1600" y="130" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="TextAnnotation_0zvon6n_di" bpmnElement="TextAnnotation_0zvon6n">
-        <dc:Bounds x="620" y="320" width="99.99274099883856" height="54.587688734030195" />
+      <bpmndi:BPMNShape id="Activity_0rue8rn_di" bpmnElement="Activity_1tlf84b">
+        <dc:Bounds x="1470" y="405" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_03j363h_di" bpmnElement="Activity_1ayanvw">
+        <dc:Bounds x="910" y="470" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0ycljh9_di" bpmnElement="Activity_01xjsm6">
+        <dc:Bounds x="1060" y="610" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_1d0dccr" bpmnElement="Gateway_11mlb7e" isMarkerVisible="true">
-        <dc:Bounds x="935" y="765" width="50" height="50" />
+        <dc:Bounds x="935" y="835" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0rue8rn_di" bpmnElement="Activity_1tlf84b">
-        <dc:Bounds x="1470" y="405" width="100" height="80" />
+      <bpmndi:BPMNShape id="Activity_03k8d7b_di" bpmnElement="Activity_0cgg53i">
+        <dc:Bounds x="220" y="770" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1qvclep_di" bpmnElement="Activity_1ype7pt">
-        <dc:Bounds x="200" y="405" width="100" height="80" />
+        <dc:Bounds x="220" y="405" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_03j363h_di" bpmnElement="Activity_1ayanvw">
-        <dc:Bounds x="910" y="470" width="100" height="80" />
-        <bpmndi:BPMNLabel />
+      <bpmndi:BPMNShape id="BPMNShape_04yy7dz" bpmnElement="Event_0no3gpy">
+        <dc:Bounds x="252" y="182" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="249" y="152" width="44" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_16iw5vb" bpmnElement="Activity_12tgqau">
+        <dc:Bounds x="1220" y="810" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="Association_09u585y_di" bpmnElement="Association_09u585y">
-        <di:waypoint x="523" y="823" />
-        <di:waypoint x="470" y="783" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Association_0okn983_di" bpmnElement="Association_0okn983">
         <di:waypoint x="848" y="558" />
         <di:waypoint x="863" y="570" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Association_09u585y_di" bpmnElement="Association_09u585y">
+        <di:waypoint x="526" y="821" />
+        <di:waypoint x="510" y="808" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Association_0re1zef_di" bpmnElement="Association_0re1zef">
+        <di:waypoint x="1148" y="610" />
+        <di:waypoint x="1160" y="598" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Association_0fa7l4r_di" bpmnElement="Association_0fa7l4r">
+        <di:waypoint x="1004" y="471" />
+        <di:waypoint x="1030" y="449" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Association_16o3e1c_di" bpmnElement="Association_16o3e1c">
+        <di:waypoint x="606" y="405" />
+        <di:waypoint x="644" y="365" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Association_0qtjopa_di" bpmnElement="Association_0qtjopa">
+        <di:waypoint x="520" y="647" />
+        <di:waypoint x="500" y="637" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Event_1n40c9e_di" bpmnElement="Event_0uxq9pi">
         <dc:Bounds x="952" y="229" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -396,7 +437,7 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_023e8ha_di" bpmnElement="Flow_023e8ha">
-        <di:waypoint x="268" y="200" />
+        <di:waypoint x="288" y="200" />
         <di:waypoint x="370" y="200" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_05vrxvm_di" bpmnElement="Flow_05vrxvm">
@@ -408,22 +449,23 @@
         <di:waypoint x="803" y="820" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0c2qvip_di" bpmnElement="Flow_0c2qvip">
-        <di:waypoint x="830" y="820" />
-        <di:waypoint x="830" y="790" />
-        <di:waypoint x="935" y="790" />
+        <di:waypoint x="853" y="860" />
+        <di:waypoint x="935" y="860" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1drebew_di" bpmnElement="Flow_1drebew">
-        <di:waypoint x="985" y="790" />
-        <di:waypoint x="1070" y="790" />
+        <di:waypoint x="985" y="860" />
+        <di:waypoint x="1020" y="860" />
+        <di:waypoint x="1020" y="650" />
+        <di:waypoint x="1060" y="650" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1022" y="772" width="18" height="14" />
+          <dc:Bounds x="1033" y="632" width="18" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0e4mjke_di" bpmnElement="Flow_0e4mjke">
-        <di:waypoint x="960" y="765" />
+        <di:waypoint x="960" y="835" />
         <di:waypoint x="960" y="550" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="962" y="653" width="15" height="14" />
+          <dc:Bounds x="972" y="676" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1k8kidl_di" bpmnElement="Flow_1k8kidl">
@@ -440,7 +482,7 @@
         <di:waypoint x="1365" y="170" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_12neab9_di" bpmnElement="Flow_12neab9">
-        <di:waypoint x="1270" y="750" />
+        <di:waypoint x="1270" y="810" />
         <di:waypoint x="1270" y="210" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1ipq78m_di" bpmnElement="Flow_1ipq78m">
@@ -483,10 +525,11 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0hqlhza_di" bpmnElement="Flow_0hqlhza">
         <di:waypoint x="1390" y="195" />
-        <di:waypoint x="1390" y="880" />
-        <di:waypoint x="853" y="880" />
+        <di:waypoint x="1390" y="930" />
+        <di:waypoint x="570" y="930" />
+        <di:waypoint x="570" y="900" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1372" y="281" width="15" height="14" />
+          <dc:Bounds x="1372" y="287" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0raf3vq_di" bpmnElement="Flow_0raf3vq">
@@ -494,12 +537,12 @@
         <di:waypoint x="520" y="200" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0zjcyq2_di" bpmnElement="Flow_0zjcyq2">
-        <di:waypoint x="250" y="218" />
-        <di:waypoint x="250" y="405" />
+        <di:waypoint x="270" y="218" />
+        <di:waypoint x="270" y="405" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0px1k4o_di" bpmnElement="Flow_0px1k4o">
-        <di:waypoint x="300" y="445" />
-        <di:waypoint x="370" y="445" />
+        <di:waypoint x="270" y="485" />
+        <di:waypoint x="270" y="770" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_16jy9r4_di" bpmnElement="Flow_16jy9r4">
         <di:waypoint x="570" y="485" />
@@ -514,7 +557,9 @@
         <di:waypoint x="570" y="630" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0d9jstt_di" bpmnElement="Flow_0d9jstt">
-        <di:waypoint x="470" y="445" />
+        <di:waypoint x="320" y="810" />
+        <di:waypoint x="350" y="810" />
+        <di:waypoint x="350" y="445" />
         <di:waypoint x="520" y="445" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_19jvq5l_di" bpmnElement="Flow_19jvq5l">
@@ -522,18 +567,16 @@
         <di:waypoint x="570" y="820" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0by2l4i_di" bpmnElement="Flow_0by2l4i">
-        <di:waypoint x="1170" y="790" />
-        <di:waypoint x="1220" y="790" />
+        <di:waypoint x="1160" y="650" />
+        <di:waypoint x="1195" y="650" />
+        <di:waypoint x="1195" y="850" />
+        <di:waypoint x="1220" y="850" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0r90fgm_di" bpmnElement="Flow_0r90fgm">
         <di:waypoint x="1540" y="405" />
         <di:waypoint x="1540" y="170" />
         <di:waypoint x="1600" y="170" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Association_16o3e1c_di" bpmnElement="Association_16o3e1c">
-        <di:waypoint x="606" y="405" />
-        <di:waypoint x="634" y="375" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_03qb6v9_di" bpmnElement="Flow_03qb6v9">
         <di:waypoint x="960" y="470" />
         <di:waypoint x="960" y="327" />