diff --git a/playground/nutech/issue2/issue2.bpmn b/playground/nutech/issue2/issue2.bpmn
index 90db5f99..1d944412 100644
--- a/playground/nutech/issue2/issue2.bpmn
+++ b/playground/nutech/issue2/issue2.bpmn
@@ -21,20 +21,19 @@
         </spiffworkflow:properties>
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_17db3yp</bpmn:incoming>
-      <bpmn:outgoing>Flow_0qrj04m</bpmn:outgoing>
+      <bpmn:outgoing>Flow_1gyv3iu</bpmn:outgoing>
     </bpmn:userTask>
     <bpmn:exclusiveGateway id="Gateway_052a0kd">
-      <bpmn:incoming>Flow_0qrj04m</bpmn:incoming>
-      <bpmn:outgoing>Flow_0lna2ai</bpmn:outgoing>
-      <bpmn:outgoing>Flow_06gwsnc</bpmn:outgoing>
+      <bpmn:incoming>Flow_1q4zwmb</bpmn:incoming>
+      <bpmn:outgoing>Flow_044tqme</bpmn:outgoing>
+      <bpmn:outgoing>Flow_0wfweaj</bpmn:outgoing>
     </bpmn:exclusiveGateway>
-    <bpmn:sequenceFlow id="Flow_0qrj04m" sourceRef="Activity_0qpzdpu" targetRef="Gateway_052a0kd" />
     <bpmn:manualTask id="Activity_186t2ny">
       <bpmn:extensionElements>
         <spiffworkflow:instructionsForEndUser>Form Approved
 </spiffworkflow:instructionsForEndUser>
       </bpmn:extensionElements>
-      <bpmn:incoming>Flow_0lna2ai</bpmn:incoming>
+      <bpmn:incoming>Flow_044tqme</bpmn:incoming>
       <bpmn:outgoing>Flow_062wh47</bpmn:outgoing>
     </bpmn:manualTask>
     <bpmn:manualTask id="Activity_1ts2r7w">
@@ -42,18 +41,29 @@
         <spiffworkflow:instructionsForEndUser>Form Rejected
 </spiffworkflow:instructionsForEndUser>
       </bpmn:extensionElements>
-      <bpmn:incoming>Flow_06gwsnc</bpmn:incoming>
+      <bpmn:incoming>Flow_0wfweaj</bpmn:incoming>
       <bpmn:outgoing>Flow_1ewdm63</bpmn:outgoing>
     </bpmn:manualTask>
-    <bpmn:sequenceFlow id="Flow_0lna2ai" name="Approved==1" sourceRef="Gateway_052a0kd" targetRef="Activity_186t2ny">
-      <bpmn:conditionExpression>Approved==1
-</bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
-    <bpmn:sequenceFlow id="Flow_06gwsnc" name="Rejected==0" sourceRef="Gateway_052a0kd" targetRef="Activity_1ts2r7w">
-      <bpmn:conditionExpression>Rejected==0</bpmn:conditionExpression>
-    </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="Flow_062wh47" sourceRef="Activity_186t2ny" targetRef="EndEvent_1" />
     <bpmn:sequenceFlow id="Flow_1ewdm63" sourceRef="Activity_1ts2r7w" targetRef="EndEvent_1" />
+    <bpmn:sequenceFlow id="Flow_1gyv3iu" sourceRef="Activity_0qpzdpu" targetRef="Activity_0ktbplg" />
+    <bpmn:userTask id="Activity_0ktbplg">
+      <bpmn:extensionElements>
+        <spiffworkflow:properties>
+          <spiffworkflow:property name="formJsonSchemaFilename" value="decisionbuttons-schema.json" />
+          <spiffworkflow:property name="formUiSchemaFilename" value="decisionbuttons-uischema.json" />
+        </spiffworkflow:properties>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_1gyv3iu</bpmn:incoming>
+      <bpmn:outgoing>Flow_1q4zwmb</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:sequenceFlow id="Flow_1q4zwmb" sourceRef="Activity_0ktbplg" targetRef="Gateway_052a0kd" />
+    <bpmn:sequenceFlow id="Flow_044tqme" name="Approved==1" sourceRef="Gateway_052a0kd" targetRef="Activity_186t2ny">
+      <bpmn:conditionExpression>Approved==1</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="Flow_0wfweaj" name="Approved==0" sourceRef="Gateway_052a0kd" targetRef="Activity_1ts2r7w">
+      <bpmn:conditionExpression>Approved==0</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_issue2_nm8svt0">
@@ -61,53 +71,61 @@
         <dc:Bounds x="179" y="159" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1rmlg1p_di" bpmnElement="Activity_0qpzdpu">
-        <dc:Bounds x="280" y="137" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Gateway_052a0kd_di" bpmnElement="Gateway_052a0kd" isMarkerVisible="true">
-        <dc:Bounds x="445" y="152" width="50" height="50" />
+        <dc:Bounds x="250" y="137" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0fn93nx_di" bpmnElement="Activity_186t2ny">
-        <dc:Bounds x="560" y="50" width="100" height="80" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1mhbs93" bpmnElement="Activity_1ts2r7w">
-        <dc:Bounds x="560" y="250" width="100" height="80" />
+        <dc:Bounds x="730" y="0" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_14za570_di" bpmnElement="EndEvent_1">
-        <dc:Bounds x="718" y="159" width="36" height="36" />
+        <dc:Bounds x="1022" y="142" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1mhbs93" bpmnElement="Activity_1ts2r7w">
+        <dc:Bounds x="760" y="230" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_052a0kd_di" bpmnElement="Gateway_052a0kd" isMarkerVisible="true">
+        <dc:Bounds x="575" y="152" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_1ukvq5a_di" bpmnElement="Activity_0ktbplg">
+        <dc:Bounds x="410" y="137" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_17db3yp_di" bpmnElement="Flow_17db3yp">
         <di:waypoint x="215" y="177" />
-        <di:waypoint x="280" y="177" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0qrj04m_di" bpmnElement="Flow_0qrj04m">
-        <di:waypoint x="380" y="177" />
-        <di:waypoint x="445" y="177" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_0lna2ai_di" bpmnElement="Flow_0lna2ai">
-        <di:waypoint x="470" y="152" />
-        <di:waypoint x="470" y="90" />
-        <di:waypoint x="560" y="90" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="478" y="103" width="66" height="14" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_06gwsnc_di" bpmnElement="Flow_06gwsnc">
-        <di:waypoint x="470" y="202" />
-        <di:waypoint x="470" y="290" />
-        <di:waypoint x="560" y="290" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="479" y="273" width="63" height="14" />
-        </bpmndi:BPMNLabel>
+        <di:waypoint x="250" y="177" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_062wh47_di" bpmnElement="Flow_062wh47">
-        <di:waypoint x="660" y="90" />
-        <di:waypoint x="736" y="90" />
-        <di:waypoint x="736" y="159" />
+        <di:waypoint x="780" y="80" />
+        <di:waypoint x="780" y="120" />
+        <di:waypoint x="1040" y="120" />
+        <di:waypoint x="1040" y="142" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1ewdm63_di" bpmnElement="Flow_1ewdm63">
-        <di:waypoint x="660" y="290" />
-        <di:waypoint x="736" y="290" />
-        <di:waypoint x="736" y="195" />
+        <di:waypoint x="860" y="270" />
+        <di:waypoint x="1040" y="270" />
+        <di:waypoint x="1040" y="178" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1gyv3iu_di" bpmnElement="Flow_1gyv3iu">
+        <di:waypoint x="350" y="177" />
+        <di:waypoint x="410" y="177" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1q4zwmb_di" bpmnElement="Flow_1q4zwmb">
+        <di:waypoint x="510" y="177" />
+        <di:waypoint x="575" y="177" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_044tqme_di" bpmnElement="Flow_044tqme">
+        <di:waypoint x="600" y="152" />
+        <di:waypoint x="600" y="40" />
+        <di:waypoint x="730" y="40" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="627" y="23" width="66" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0wfweaj_di" bpmnElement="Flow_0wfweaj">
+        <di:waypoint x="600" y="202" />
+        <di:waypoint x="600" y="270" />
+        <di:waypoint x="760" y="270" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="627" y="243" width="66" height="14" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>