diff --git a/process-blocks/spacetraders-deliver-contract-goods.bpmn b/process-blocks/spacetraders-deliver-contract-goods.bpmn
index 40d01d7..d976a36 100644
--- a/process-blocks/spacetraders-deliver-contract-goods.bpmn
+++ b/process-blocks/spacetraders-deliver-contract-goods.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:modeler="http://camunda.org/schema/modeler/1.0" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Web Modeler" exporterVersion="73b37dd" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.3.0" camunda:diagramRelationId="80080f63-8a1f-406c-95cf-3ee310c54eed">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:modeler="http://camunda.org/schema/modeler/1.0" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Web Modeler" exporterVersion="4e488fc" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.3.0" camunda:diagramRelationId="80080f63-8a1f-406c-95cf-3ee310c54eed">
   <bpmn:process id="space-traders-deliver-contract-goods" name="SpaceTraders Deliver contract goods" isExecutable="true">
     <bpmn:extensionElements />
     <bpmn:startEvent id="StartEvent_1" name="Deliver contract goods">
@@ -16,7 +16,7 @@
       <bpmn:incoming>Flow_1c9inve</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:exclusiveGateway id="Gateway_1yzbhs3" name="Has delivered all goods?" default="Flow_0otnh62">
-      <bpmn:incoming>Flow_1mh7sk1</bpmn:incoming>
+      <bpmn:incoming>Flow_0s1e5t2</bpmn:incoming>
       <bpmn:outgoing>Flow_0jkwsfe</bpmn:outgoing>
       <bpmn:outgoing>Flow_0otnh62</bpmn:outgoing>
     </bpmn:exclusiveGateway>
@@ -45,7 +45,7 @@
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">=some good in cargo.inventory.symbol satisfies list contains(contract.terms.deliver.tradeSymbol, good)</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:subProcess id="Activity_009182e" name="Deliver contract goods for destinations">
-      <bpmn:incoming>Flow_0v14jge</bpmn:incoming>
+      <bpmn:incoming>Flow_0hj7dc4</bpmn:incoming>
       <bpmn:outgoing>Flow_1mh7sk1</bpmn:outgoing>
       <bpmn:multiInstanceLoopCharacteristics isSequential="true">
         <bpmn:extensionElements>
@@ -67,7 +67,7 @@
             <zeebe:input source="=contract.id" target="objects.deliverContract_contractId" />
             <zeebe:input source="=current_ship" target="objects.deliverContract_deliverContractRequest.shipSymbol" />
             <zeebe:input source="=deliver_good" target="objects.deliverContract_deliverContractRequest.tradeSymbol" />
-            <zeebe:input source="=cargo.inventory[symbol = deliver_good][1].units" target="objects.deliverContract_deliverContractRequest.units" />
+            <zeebe:input source="={&#10;cargo_units: cargo.inventory[symbol = deliver_good][1].units,&#10;to_deliver: contract.terms.deliver[tradeSymbol = deliver_good][1],&#10;remaining_units: to_deliver.unitsRequired - to_deliver.unitsFulfilled,&#10;units_to_deliver: min(cargo_units, remaining_units) &#10;}.units_to_deliver" target="objects.deliverContract_deliverContractRequest.units" />
             <zeebe:input source="bearer" target="authentication.type" />
             <zeebe:input source="=token" target="authentication.token" />
             <zeebe:input source="post" target="method" />
@@ -106,7 +106,7 @@
       <bpmn:incoming>Flow_1tc5yrh</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="Flow_1tc5yrh" name="No" sourceRef="Gateway_12bg5mf" targetRef="Event_1oh4kzd" />
-    <bpmn:sequenceFlow id="Flow_1mh7sk1" sourceRef="Activity_009182e" targetRef="Gateway_1yzbhs3" />
+    <bpmn:sequenceFlow id="Flow_1mh7sk1" sourceRef="Activity_009182e" targetRef="Gateway_0e9mesr" />
     <bpmn:serviceTask id="Activity_04aurzq" name="Get ship cargo" zeebe:modelerTemplate="com.camunda.SpaceTradersApi" zeebe:modelerTemplateVersion="5" zeebe:modelerTemplateIcon="data:image/png;base64,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">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="io.camunda:http-json:1" retries="10" />
@@ -186,18 +186,53 @@
       <bpmn:incoming>Flow_1wd0cgz</bpmn:incoming>
       <bpmn:outgoing>Flow_0v14jge</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:sequenceFlow id="Flow_0v14jge" sourceRef="Activity_098u3y0" targetRef="Activity_009182e" />
+    <bpmn:sequenceFlow id="Flow_0v14jge" sourceRef="Activity_098u3y0" targetRef="Activity_0lewwy2" />
+    <bpmn:boundaryEvent id="Event_11mlvos" name="Delivery failed" attachedToRef="Activity_009182e">
+      <bpmn:outgoing>Flow_0xiajvd</bpmn:outgoing>
+      <bpmn:errorEventDefinition id="ErrorEventDefinition_0p84m3j" errorRef="Error_1tvd5oh" />
+    </bpmn:boundaryEvent>
+    <bpmn:exclusiveGateway id="Gateway_0e9mesr">
+      <bpmn:incoming>Flow_1mh7sk1</bpmn:incoming>
+      <bpmn:incoming>Flow_0xiajvd</bpmn:incoming>
+      <bpmn:outgoing>Flow_0s1e5t2</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="Flow_0s1e5t2" sourceRef="Gateway_0e9mesr" targetRef="Gateway_1yzbhs3" />
+    <bpmn:sequenceFlow id="Flow_0xiajvd" sourceRef="Event_11mlvos" targetRef="Gateway_0e9mesr" />
+    <bpmn:sequenceFlow id="Flow_0hj7dc4" sourceRef="Activity_0lewwy2" targetRef="Activity_009182e" />
+    <bpmn:serviceTask id="Activity_0lewwy2" name="Get contract details" zeebe:modelerTemplate="com.camunda.SpaceTradersApi" zeebe:modelerTemplateVersion="5" zeebe:modelerTemplateIcon="data:image/png;base64,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">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="io.camunda:http-json:1" retries="10" />
+        <zeebe:ioMapping>
+          <zeebe:input source="placeholder" target="objects" />
+          <zeebe:input source="=contract.id" target="objects.getContract_contractId" />
+          <zeebe:input source="bearer" target="authentication.type" />
+          <zeebe:input source="=token" target="authentication.token" />
+          <zeebe:input source="get" target="method" />
+          <zeebe:input source="=&#34;https://api.spacetraders.io/v2/my/contracts/&#34; + string(objects.getContract_contractId) + &#34;&#34;" target="url" />
+          <zeebe:input source="={&#10;}" target="queryParameters" />
+        </zeebe:ioMapping>
+        <zeebe:taskHeaders>
+          <zeebe:header key="category" value="contracts" />
+          <zeebe:header key="operation" value="getContract" />
+          <zeebe:header key="resultExpression" value="={&#34;contract&#34;: response.body.data}" />
+          <zeebe:header key="errorExpression" value="=if matches(error.code, &#34;4\d\d&#34;)&#10;then {&#10;  error_code: substring after(extract(error.message,&#34;\&#34;code\&#34;:\d{4}&#34;)[1], &#34;:&#34;),&#10;  error_message: substring(extract(error.message, &#34;\&#34;message\&#34;:\&#34;(\w|\d|\s|\.|\-)+&#34;)[1], 12),&#10;  error_code_by_name: {&#10;    &#34;4000&#34;:&#34;cooldownConflictError&#34;,&#10;    &#34;4001&#34;:&#34;waypointNoAccessError&#34;,&#10;    &#34;4100&#34;:&#34;tokenEmptyError&#34;,&#10;    &#34;4101&#34;:&#34;tokenMissingSubjectError&#34;,&#10;    &#34;4102&#34;:&#34;tokenInvalidSubjectError&#34;,&#10;    &#34;4103&#34;:&#34;missingTokenRequestError&#34;,&#10;    &#34;4104&#34;:&#34;invalidTokenRequestError&#34;,&#10;    &#34;4105&#34;:&#34;invalidTokenSubjectError&#34;,&#10;    &#34;4106&#34;:&#34;accountNotExistsError&#34;,&#10;    &#34;4107&#34;:&#34;agentNotExistsError&#34;,&#10;    &#34;4108&#34;:&#34;accountHasNoAgentError&#34;,&#10;    &#34;4109&#34;:&#34;registerAgentExistsError&#34;,&#10;    &#34;4110&#34;:&#34;registerAgentSymbolReservedError&#34;,&#10;    &#34;4111&#34;:&#34;registerAgentConflictSymbolError&#34;,&#10;    &#34;4200&#34;:&#34;navigateInTransitError&#34;,&#10;    &#34;4201&#34;:&#34;navigateInvalidDestinationError&#34;,&#10;    &#34;4202&#34;:&#34;navigateOutsideSystemError&#34;,&#10;    &#34;4203&#34;:&#34;navigateInsufficientFuelError&#34;,&#10;    &#34;4204&#34;:&#34;navigateSameDestinationError&#34;,&#10;    &#34;4205&#34;:&#34;shipExtractInvalidWaypointError&#34;,&#10;    &#34;4206&#34;:&#34;shipExtractPermissionError&#34;,&#10;    &#34;4207&#34;:&#34;shipJumpNoSystemError&#34;,&#10;    &#34;4208&#34;:&#34;shipJumpSameSystemError&#34;,&#10;    &#34;4210&#34;:&#34;shipJumpMissingModuleError&#34;,&#10;    &#34;4211&#34;:&#34;shipJumpNoValidWaypointError&#34;,&#10;    &#34;4212&#34;:&#34;shipJumpMissingAntimatterError&#34;,&#10;    &#34;4214&#34;:&#34;shipInTransitError&#34;,&#10;    &#34;4215&#34;:&#34;shipMissingSensorArraysError&#34;,&#10;    &#34;4216&#34;:&#34;purchaseShipCreditsError&#34;,&#10;    &#34;4217&#34;:&#34;shipCargoExceedsLimitError&#34;,&#10;    &#34;4218&#34;:&#34;shipCargoMissingError&#34;,&#10;    &#34;4219&#34;:&#34;shipCargoUnitCountError&#34;,&#10;    &#34;4220&#34;:&#34;shipSurveyVerificationError&#34;,&#10;    &#34;4221&#34;:&#34;shipSurveyExpirationError&#34;,&#10;    &#34;4222&#34;:&#34;shipSurveyWaypointTypeError&#34;,&#10;    &#34;4223&#34;:&#34;shipSurveyOrbitError&#34;,&#10;    &#34;4224&#34;:&#34;shipSurveyExhaustedError&#34;,&#10;    &#34;4225&#34;:&#34;shipRefuelDockedError&#34;,&#10;    &#34;4226&#34;:&#34;shipRefuelInvalidWaypointError&#34;,&#10;    &#34;4227&#34;:&#34;shipMissingMountsError&#34;,&#10;    &#34;4228&#34;:&#34;shipCargoFullError&#34;,&#10;    &#34;4229&#34;:&#34;shipJumpFromGateToGateError&#34;,&#10;    &#34;4230&#34;:&#34;waypointChartedError&#34;,&#10;    &#34;4231&#34;:&#34;shipTransferShipNotFound&#34;,&#10;    &#34;4232&#34;:&#34;shipTransferAgentConflict&#34;,&#10;    &#34;4233&#34;:&#34;shipTransferSameShipConflict&#34;,&#10;    &#34;4234&#34;:&#34;shipTransferLocationConflict&#34;,&#10;    &#34;4235&#34;:&#34;warpInsideSystemError&#34;,&#10;    &#34;4236&#34;:&#34;shipNotInOrbitError&#34;,&#10;    &#34;4237&#34;:&#34;shipInvalidRefineryGoodError&#34;,&#10;    &#34;4238&#34;:&#34;shipInvalidRefineryTypeError&#34;,&#10;    &#34;4239&#34;:&#34;shipMissingRefineryError&#34;,&#10;    &#34;4240&#34;:&#34;shipMissingSurveyorError&#34;,&#10;    &#34;4241&#34;:&#34;shipMissingWarpDriveError&#34;,&#10;    &#34;4242&#34;:&#34;shipMissingMineralProcessorError&#34;,&#10;    &#34;4243&#34;:&#34;shipMissingMiningLasersError&#34;,&#10;    &#34;4244&#34;:&#34;shipNotDockedError&#34;,&#10;    &#34;4245&#34;:&#34;purchaseShipNotPresentError&#34;,&#10;    &#34;4246&#34;:&#34;shipMountNoShipyardError&#34;,&#10;    &#34;4247&#34;:&#34;shipMissingMountError&#34;,&#10;    &#34;4248&#34;:&#34;shipMountInsufficientCreditsError&#34;,&#10;    &#34;4249&#34;:&#34;shipMissingPowerError&#34;,&#10;    &#34;4250&#34;:&#34;shipMissingSlotsError&#34;,&#10;    &#34;4251&#34;:&#34;shipMissingMountsError&#34;,&#10;    &#34;4252&#34;:&#34;shipMissingCrewError&#34;,&#10;    &#34;4253&#34;:&#34;shipExtractDestabilizedError&#34;,&#10;    &#34;4254&#34;:&#34;shipJumpInvalidOriginError&#34;,&#10;    &#34;4255&#34;:&#34;shipJumpInvalidWaypointError&#34;,&#10;    &#34;4256&#34;:&#34;shipJumpOriginUnderConstructionError&#34;,&#10;    &#34;4257&#34;:&#34;shipMissingGasProcessorError&#34;,&#10;    &#34;4258&#34;:&#34;shipMissingGasSiphonsError&#34;,&#10;    &#34;4259&#34;:&#34;shipSiphonInvalidWaypointError&#34;,&#10;    &#34;4260&#34;:&#34;shipSiphonPermissionError&#34;,&#10;    &#34;4261&#34;:&#34;waypointNoYieldError&#34;,&#10;    &#34;4262&#34;:&#34;shipJumpDestinationUnderConstructionError&#34;,&#10;    &#34;4500&#34;:&#34;acceptContractNotAuthorizedError&#34;,&#10;    &#34;4501&#34;:&#34;acceptContractConflictError&#34;,&#10;    &#34;4502&#34;:&#34;fulfillContractDeliveryError&#34;,&#10;    &#34;4503&#34;:&#34;contractDeadlineError&#34;,&#10;    &#34;4504&#34;:&#34;contractFulfilledError&#34;,&#10;    &#34;4505&#34;:&#34;contractNotAcceptedError&#34;,&#10;    &#34;4506&#34;:&#34;contractNotAuthorizedError&#34;,&#10;    &#34;4508&#34;:&#34;shipDeliverTermsError&#34;,&#10;    &#34;4509&#34;:&#34;shipDeliverFulfilledError&#34;,&#10;    &#34;4510&#34;:&#34;shipDeliverInvalidLocationError&#34;,&#10;    &#34;4511&#34;:&#34;existingContractError&#34;,&#10;    &#34;4600&#34;:&#34;marketTradeInsufficientCreditsError&#34;,&#10;    &#34;4601&#34;:&#34;marketTradeNoPurchaseError&#34;,&#10;    &#34;4602&#34;:&#34;marketTradeNotSoldError&#34;,&#10;    &#34;4603&#34;:&#34;marketNotFoundError&#34;,&#10;    &#34;4604&#34;:&#34;marketTradeUnitLimitError&#34;,&#10;    &#34;4700&#34;:&#34;waypointNoFactionError&#34;,&#10;    &#34;4800&#34;:&#34;constructionMaterialNotRequired&#34;,&#10;    &#34;4801&#34;:&#34;constructionMaterialFulfilled&#34;,&#10;    &#34;4802&#34;:&#34;shipConstructionInvalidLocationError&#34;&#10;  },&#10;  bpmn_error_code: get or else(get value(error_code_by_name, error_code), error_code),&#10;  error_data: {error_code: error_code, error_message: error_message, error_name: bpmn_error_code},&#10;  bpmnError: bpmnError(bpmn_error_code, error_message, error_data)&#10;}.bpmnError&#10;else null" />
+          <zeebe:header key="retryBackoff" value="PT1S" />
+        </zeebe:taskHeaders>
+        <zeebe:properties>
+          <zeebe:property name="custom_error_handling" value="by_error_name" />
+        </zeebe:properties>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_0v14jge</bpmn:incoming>
+      <bpmn:outgoing>Flow_0hj7dc4</bpmn:outgoing>
+    </bpmn:serviceTask>
     <bpmn:textAnnotation id="TextAnnotation_1s4fmey">
       <bpmn:text>Required variable:  current_ship, contract</bpmn:text>
     </bpmn:textAnnotation>
     <bpmn:association id="Association_084mbaj" sourceRef="StartEvent_1" targetRef="TextAnnotation_1s4fmey" />
   </bpmn:process>
+  <bpmn:error id="Error_1tvd5oh" name="shipDeliverFulfilledError" errorCode="shipDeliverFulfilledError" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="space-traders-deliver-contract-goods">
-      <bpmndi:BPMNShape id="TextAnnotation_1s4fmey_di" bpmnElement="TextAnnotation_1s4fmey">
-        <dc:Bounds x="160" y="80" width="158" height="45" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="282" y="160" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -210,63 +245,94 @@
           <dc:Bounds x="537" y="116" width="65" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_0jccbwl_di" bpmnElement="Activity_04aurzq">
-        <dc:Bounds x="380" y="138" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_1oh4kzd_di" bpmnElement="Event_1oh4kzd">
         <dc:Bounds x="552" y="332" width="36" height="36" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="540" y="375" width="60" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0jccbwl_di" bpmnElement="Activity_04aurzq">
+        <dc:Bounds x="380" y="138" width="100" height="80" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_1bi9aqb" bpmnElement="Activity_098u3y0">
         <dc:Bounds x="680" y="138" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_039o9rs_di" bpmnElement="Event_039o9rs">
-        <dc:Bounds x="1572" y="160" width="36" height="36" />
+        <dc:Bounds x="1862" y="160" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1551" y="203" width="79" height="14" />
+          <dc:Bounds x="1841" y="203" width="79" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_1yzbhs3_di" bpmnElement="Gateway_1yzbhs3" isMarkerVisible="true">
-        <dc:Bounds x="1283" y="153" width="50" height="50" />
+        <dc:Bounds x="1573" y="153" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1267" y="116" width="82" height="27" />
+          <dc:Bounds x="1557" y="116" width="82" height="27" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0buj847_di" bpmnElement="Event_0buj847">
-        <dc:Bounds x="1572" y="292" width="36" height="36" />
+        <dc:Bounds x="1862" y="292" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1550" y="335" width="80" height="14" />
+          <dc:Bounds x="1840" y="335" width="80" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0baazwz_di" bpmnElement="Activity_0x4r1kj">
-        <dc:Bounds x="1398" y="138" width="100" height="80" />
+        <dc:Bounds x="1688" y="138" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_0e9mesr_di" bpmnElement="Gateway_0e9mesr" isMarkerVisible="true">
+        <dc:Bounds x="1455" y="153" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0a2r3z5_di" bpmnElement="Activity_0lewwy2">
+        <dc:Bounds x="850" y="138" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_009182e_di" bpmnElement="Activity_009182e" isExpanded="true">
-        <dc:Bounds x="840" y="90" width="370" height="170" />
+        <dc:Bounds x="1010" y="90" width="370" height="170" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0acqlks_di" bpmnElement="Event_0acqlks">
-        <dc:Bounds x="880" y="160" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_0us6ytp" bpmnElement="Activity_1pq3s6x">
-        <dc:Bounds x="990" y="138" width="100" height="80" />
+        <dc:Bounds x="1050" y="160" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0907mye_di" bpmnElement="Event_0907mye">
-        <dc:Bounds x="1142" y="160" width="36" height="36" />
+        <dc:Bounds x="1312" y="160" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_0us6ytp" bpmnElement="Activity_1pq3s6x">
+        <dc:Bounds x="1160" y="138" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_08g5apu_di" bpmnElement="Flow_08g5apu">
-        <di:waypoint x="916" y="178" />
-        <di:waypoint x="990" y="178" />
+        <di:waypoint x="1086" y="178" />
+        <di:waypoint x="1160" y="178" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0r58khn_di" bpmnElement="Flow_0r58khn">
-        <di:waypoint x="1090" y="178" />
-        <di:waypoint x="1142" y="178" />
+        <di:waypoint x="1260" y="178" />
+        <di:waypoint x="1312" y="178" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Association_084mbaj_di" bpmnElement="Association_084mbaj">
-        <di:waypoint x="290" y="163" />
-        <di:waypoint x="263" y="125" />
+      <bpmndi:BPMNShape id="Event_0sfns2m_di" bpmnElement="Event_11mlvos">
+        <dc:Bounds x="1362" y="242" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1395" y="283" width="70" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="TextAnnotation_1s4fmey_di" bpmnElement="TextAnnotation_1s4fmey">
+        <dc:Bounds x="160" y="80" width="158" height="45" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_0jkwsfe_di" bpmnElement="Flow_0jkwsfe">
+        <di:waypoint x="1623" y="178" />
+        <di:waypoint x="1688" y="178" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1647" y="160" width="19" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1c9inve_di" bpmnElement="Flow_1c9inve">
+        <di:waypoint x="1788" y="178" />
+        <di:waypoint x="1862" y="178" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0otnh62_di" bpmnElement="Flow_0otnh62">
+        <di:waypoint x="1598" y="203" />
+        <di:waypoint x="1598" y="310" />
+        <di:waypoint x="1862" y="310" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1652" y="293" width="15" height="14" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_14sorii_di" bpmnElement="Flow_14sorii">
         <di:waypoint x="318" y="178" />
@@ -290,32 +356,31 @@
           <dc:Bounds x="578" y="265" width="15" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1mh7sk1_di" bpmnElement="Flow_1mh7sk1">
+        <di:waypoint x="1380" y="178" />
+        <di:waypoint x="1455" y="178" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0v14jge_di" bpmnElement="Flow_0v14jge">
         <di:waypoint x="780" y="178" />
-        <di:waypoint x="840" y="178" />
+        <di:waypoint x="850" y="178" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1c9inve_di" bpmnElement="Flow_1c9inve">
-        <di:waypoint x="1498" y="178" />
-        <di:waypoint x="1572" y="178" />
+      <bpmndi:BPMNEdge id="Flow_0s1e5t2_di" bpmnElement="Flow_0s1e5t2">
+        <di:waypoint x="1505" y="178" />
+        <di:waypoint x="1573" y="178" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1mh7sk1_di" bpmnElement="Flow_1mh7sk1">
-        <di:waypoint x="1210" y="178" />
-        <di:waypoint x="1283" y="178" />
+      <bpmndi:BPMNEdge id="Flow_0xiajvd_di" bpmnElement="Flow_0xiajvd">
+        <di:waypoint x="1380" y="278" />
+        <di:waypoint x="1380" y="310" />
+        <di:waypoint x="1480" y="310" />
+        <di:waypoint x="1480" y="203" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0jkwsfe_di" bpmnElement="Flow_0jkwsfe">
-        <di:waypoint x="1333" y="178" />
-        <di:waypoint x="1398" y="178" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1357" y="160" width="19" height="14" />
-        </bpmndi:BPMNLabel>
+      <bpmndi:BPMNEdge id="Association_084mbaj_di" bpmnElement="Association_084mbaj">
+        <di:waypoint x="290" y="163" />
+        <di:waypoint x="263" y="125" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0otnh62_di" bpmnElement="Flow_0otnh62">
-        <di:waypoint x="1308" y="203" />
-        <di:waypoint x="1308" y="310" />
-        <di:waypoint x="1572" y="310" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1362" y="293" width="15" height="14" />
-        </bpmndi:BPMNLabel>
+      <bpmndi:BPMNEdge id="Flow_0hj7dc4_di" bpmnElement="Flow_0hj7dc4">
+        <di:waypoint x="950" y="178" />
+        <di:waypoint x="1010" y="178" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>