diff --git a/examples/2-in-depth/data-stores/populate-data-store/populate-data-store.bpmn b/examples/2-in-depth/data-stores/populate-data-store/populate-data-store.bpmn
index 08543b7d..e7fd47ae 100644
--- a/examples/2-in-depth/data-stores/populate-data-store/populate-data-store.bpmn
+++ b/examples/2-in-depth/data-stores/populate-data-store/populate-data-store.bpmn
@@ -9,7 +9,7 @@
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>The process instance completed successfully.</spiffworkflow:instructionsForEndUser>
       </bpmn:extensionElements>
-      <bpmn:incoming>Flow_184azfl</bpmn:incoming>
+      <bpmn:incoming>Flow_1hb6m9c</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="Flow_12pkbxb" sourceRef="Activity_0qpzdpu" targetRef="Activity_09c6nko" />
     <bpmn:scriptTask id="Activity_0qpzdpu" name="Populate Data Store">
@@ -203,12 +203,8 @@ You can also change the text you are reading here by updating the *Instructions*
 </bpmn:script>
     </bpmn:scriptTask>
     <bpmn:dataStoreReference id="DataStoreReference_1yx3y4c" name="Data Store (german_philosophers)" dataStoreRef="german_philosophers" />
-    <bpmn:task id="Activity_09c6nko" name="No-Op">
-      <bpmn:incoming>Flow_12pkbxb</bpmn:incoming>
-      <bpmn:outgoing>Flow_0dz9zf6</bpmn:outgoing>
-    </bpmn:task>
     <bpmn:sequenceFlow id="Flow_0dz9zf6" sourceRef="Activity_09c6nko" targetRef="Activity_02wo1je" />
-    <bpmn:sequenceFlow id="Flow_184azfl" sourceRef="Activity_02wo1je" targetRef="EndEvent_1" />
+    <bpmn:sequenceFlow id="Flow_184azfl" sourceRef="Activity_02wo1je" targetRef="Activity_0ydla3d" />
     <bpmn:manualTask id="Activity_02wo1je" name="Show Data Store">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>| Philosopher | Major Works |
@@ -226,28 +222,41 @@ You can also change the text you are reading here by updating the *Instructions*
         <bpmn:targetRef>Property_078wrm1</bpmn:targetRef>
       </bpmn:dataInputAssociation>
     </bpmn:manualTask>
+    <bpmn:sequenceFlow id="Flow_1hb6m9c" sourceRef="Activity_0ydla3d" targetRef="EndEvent_1" />
+    <bpmn:scriptTask id="Activity_09c6nko" name="No-Op">
+      <bpmn:incoming>Flow_12pkbxb</bpmn:incoming>
+      <bpmn:outgoing>Flow_0dz9zf6</bpmn:outgoing>
+      <bpmn:script>pass</bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:scriptTask id="Activity_0ydla3d" name="No-Op2">
+      <bpmn:incoming>Flow_184azfl</bpmn:incoming>
+      <bpmn:outgoing>Flow_1hb6m9c</bpmn:outgoing>
+      <bpmn:script>pass</bpmn:script>
+    </bpmn:scriptTask>
     <bpmn:textAnnotation id="TextAnnotation_0kqbgms">
       <bpmn:text>This script task assigns a local variable with the same name as the data store. This in combination with arrow pointing into the store, will cause the information to be written.</bpmn:text>
     </bpmn:textAnnotation>
     <bpmn:association id="Association_12oy6mf" sourceRef="Activity_0qpzdpu" targetRef="TextAnnotation_0kqbgms" />
     <bpmn:textAnnotation id="TextAnnotation_0duh4ez">
-      <bpmn:text>This Script doesn't do anything, but if you view a completed process instance diagram, you will see it does not have access to the data store, because it is not connected to it like the other tasks.</bpmn:text>
+      <bpmn:text>These Script do not do anything, but if you view a completed process instance diagram, you will see they do not have access to the data store here is no "german_philosophers", because they are not connected to the data sore.</bpmn:text>
     </bpmn:textAnnotation>
     <bpmn:association id="Association_1xmxoqo" sourceRef="Activity_09c6nko" targetRef="TextAnnotation_0duh4ez" />
     <bpmn:textAnnotation id="TextAnnotation_1kw6rar">
       <bpmn:text>This will display the data store by referencing a local variable with same name as the data store "german_philosophers"</bpmn:text>
     </bpmn:textAnnotation>
     <bpmn:association id="Association_12kr3qt" sourceRef="Activity_02wo1je" targetRef="TextAnnotation_1kw6rar" />
+    <bpmn:association id="Association_0ther5z" sourceRef="TextAnnotation_0duh4ez" targetRef="Activity_0ydla3d" />
   </bpmn:process>
   <bpmn:dataStore id="german_philosophers" name="JSONDataStore" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_populate_data_store_9nyy6hu">
+      <bpmndi:BPMNShape id="TextAnnotation_0duh4ez_di" bpmnElement="TextAnnotation_0duh4ez">
+        <dc:Bounds x="540" y="290" width="250" height="98" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
         <dc:Bounds x="179" y="159" width="36" height="36" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_14za570_di" bpmnElement="EndEvent_1">
-        <dc:Bounds x="742" y="159" width="36" height="36" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1e6hw1x_di" bpmnElement="Activity_0qpzdpu">
         <dc:Bounds x="270" y="137" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -257,10 +266,6 @@ You can also change the text you are reading here by updating the *Instructions*
           <dc:Bounds x="436" y="-45" width="88" height="40" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_09c6nko_di" bpmnElement="Activity_09c6nko">
-        <dc:Bounds x="430" y="137" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0hqeq0u_di" bpmnElement="Activity_02wo1je">
         <dc:Bounds x="590" y="137" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -268,14 +273,28 @@ You can also change the text you are reading here by updating the *Instructions*
         <dc:Bounds x="160" y="-20" width="230" height="84" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="TextAnnotation_0duh4ez_di" bpmnElement="TextAnnotation_0duh4ez">
-        <dc:Bounds x="340" y="290" width="250" height="90" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="TextAnnotation_1kw6rar_di" bpmnElement="TextAnnotation_1kw6rar">
         <dc:Bounds x="690" y="10" width="230" height="70" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_14za570_di" bpmnElement="EndEvent_1">
+        <dc:Bounds x="882" y="159" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1rb5ebd_di" bpmnElement="Activity_09c6nko">
+        <dc:Bounds x="430" y="137" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_0veaueg_di" bpmnElement="Activity_0ydla3d">
+        <dc:Bounds x="730" y="137" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Association_1xmxoqo_di" bpmnElement="Association_1xmxoqo">
+        <di:waypoint x="503" y="217" />
+        <di:waypoint x="544" y="290" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Association_0ther5z_di" bpmnElement="Association_0ther5z">
+        <di:waypoint x="706" y="290" />
+        <di:waypoint x="766" y="217" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_17db3yp_di" bpmnElement="Flow_17db3yp">
         <di:waypoint x="215" y="177" />
         <di:waypoint x="270" y="177" />
@@ -294,7 +313,7 @@ You can also change the text you are reading here by updating the *Instructions*
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_184azfl_di" bpmnElement="Flow_184azfl">
         <di:waypoint x="690" y="177" />
-        <di:waypoint x="742" y="177" />
+        <di:waypoint x="730" y="177" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="DataInputAssociation_02zpmgt_di" bpmnElement="DataInputAssociation_02zpmgt">
         <di:waypoint x="505" y="53" />
@@ -304,14 +323,14 @@ You can also change the text you are reading here by updating the *Instructions*
         <di:waypoint x="296" y="137" />
         <di:waypoint x="252" y="64" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Association_1xmxoqo_di" bpmnElement="Association_1xmxoqo">
-        <di:waypoint x="452" y="217" />
-        <di:waypoint x="401" y="290" />
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Association_12kr3qt_di" bpmnElement="Association_12kr3qt">
         <di:waypoint x="666" y="137" />
         <di:waypoint x="704" y="80" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1hb6m9c_di" bpmnElement="Flow_1hb6m9c">
+        <di:waypoint x="830" y="177" />
+        <di:waypoint x="882" y="177" />
+      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>