diff --git a/playground/nutech/timer1/timer_start.bpmn b/playground/nutech/timer1/timer_start.bpmn
index a8df0e9c..cfbc5192 100644
--- a/playground/nutech/timer1/timer_start.bpmn
+++ b/playground/nutech/timer1/timer_start.bpmn
@@ -46,7 +46,9 @@
         <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">timeDuration</bpmn:timeDuration>
       </bpmn:timerEventDefinition>
     </bpmn:intermediateCatchEvent>
-    <bpmn:sequenceFlow id="Flow_1g0ycbx" sourceRef="Gateway_0jl1m1j" targetRef="Activity_1lxbv10" />
+    <bpmn:sequenceFlow id="Flow_1g0ycbx" sourceRef="Gateway_0jl1m1j" targetRef="Activity_1lxbv10">
+      <bpmn:conditionExpression>done=='False'</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
     <bpmn:manualTask id="Activity_1lxbv10">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>Waiting for timer</spiffworkflow:instructionsForEndUser>
@@ -60,7 +62,9 @@
       <bpmn:incoming>Flow_0ptik6o</bpmn:incoming>
     </bpmn:endEvent>
     <bpmn:sequenceFlow id="Flow_0mv3o88" sourceRef="Event_0kbxyoi" targetRef="Event_1r3ejgf" />
-    <bpmn:sequenceFlow id="Flow_0ptik6o" sourceRef="Gateway_0jl1m1j" targetRef="Event_1r3ejgf" />
+    <bpmn:sequenceFlow id="Flow_0ptik6o" sourceRef="Gateway_0jl1m1j" targetRef="Event_1r3ejgf">
+      <bpmn:conditionExpression>done=='True'</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="timer_start">
@@ -116,9 +120,7 @@
       <bpmndi:BPMNEdge id="Flow_0ptik6o_di" bpmnElement="Flow_0ptik6o">
         <di:waypoint x="330" y="205" />
         <di:waypoint x="330" y="320" />
-        <di:waypoint x="509" y="320" />
-        <di:waypoint x="509" y="330" />
-        <di:waypoint x="680" y="330" />
+        <di:waypoint x="680" y="320" />
         <di:waypoint x="680" y="188" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>