diff --git a/show/dance2017/effect/pool_c.n3 b/show/dance2017/effect/pool_c.n3
--- a/show/dance2017/effect/pool_c.n3
+++ b/show/dance2017/effect/pool_c.n3
@@ -9,10 +9,9 @@
 
 
 effect:pool_c a :Effect; rdfs:label "pool_c"; :publishAttr :strength;
-     :setting effect:pool_c_set0, effect:pool_c_set1, effect:pool_c_set2, effect:pool_c_set3, effect:pool_c_set4, effect:pool_c_set5 .
-effect:pool_c_set0 :device dev:q1; :deviceAttr :zoom; :value 0.834 .
-effect:pool_c_set1 :device dev:q1; :deviceAttr :ry; :value 0.376 .
+     :setting effect:pool_c_set2, effect:pool_c_set3, effect:pool_c_set4, effect:pool_c_set5 ,effect:pool_c_set6.
 effect:pool_c_set2 :device dev:q2; :deviceAttr :color; :scaledValue "#ffffff" .
 effect:pool_c_set3 :device dev:q2; :deviceAttr :ry; :value 0.463 .
 effect:pool_c_set4 :device dev:q2; :deviceAttr :zoom; :value 0.900 .
 effect:pool_c_set5 :device dev:q2; :deviceAttr :rx; :value 0.492 .
+effect:pool_c_set6 :device dev:q2; :deviceAttr :focus; :value 0.5 .
diff --git a/show/dance2017/effect/pool_l.n3 b/show/dance2017/effect/pool_l.n3
--- a/show/dance2017/effect/pool_l.n3
+++ b/show/dance2017/effect/pool_l.n3
@@ -9,8 +9,9 @@
 
 
 effect:pool_l a :Effect; rdfs:label "pool_l"; :publishAttr :strength;
-     :setting effect:pool_l_set0, effect:pool_l_set1, effect:pool_l_set2 ,effect:pool_l_set3 .
+     :setting effect:pool_l_set0, effect:pool_l_set1, effect:pool_l_set2 ,effect:pool_l_set3 ,effect:pool_l_set4 .
 effect:pool_l_set0 :device dev:q1; :deviceAttr :color; :scaledValue "#ffffff" .
 effect:pool_l_set1 :device dev:q1; :deviceAttr :zoom; :value 0.834 .
+effect:pool_l_set4 :device dev:q1; :deviceAttr :focus; :value 0.5 .
 effect:pool_l_set2 :device dev:q1; :deviceAttr :ry; :value 0.376 .
 effect:pool_l_set3 :device dev:q1; :deviceAttr :rx; :value 0.308 .
diff --git a/show/dance2017/effect/pool_r.n3 b/show/dance2017/effect/pool_r.n3
--- a/show/dance2017/effect/pool_r.n3
+++ b/show/dance2017/effect/pool_r.n3
@@ -9,13 +9,9 @@
 
 
 effect:pool_r a :Effect; rdfs:label "pool_r"; :publishAttr :strength;
-     :setting effect:pool_r_set0, effect:pool_r_set1, effect:pool_r_set2, effect:pool_r_set3, effect:pool_r_set4, effect:pool_r_set5, effect:pool_r_set6, effect:pool_r_set7, effect:pool_r_set8 .
-effect:pool_r_set0 :device dev:q1; :deviceAttr :zoom; :value 0.834 .
-effect:pool_r_set1 :device dev:q1; :deviceAttr :ry; :value 0.376 .
-effect:pool_r_set2 :device dev:q2; :deviceAttr :ry; :value 0.463 .
-effect:pool_r_set3 :device dev:q2; :deviceAttr :zoom; :value 0.900 .
-effect:pool_r_set4 :device dev:q2; :deviceAttr :rx; :value 0.492 .
+     :setting  effect:pool_r_set5, effect:pool_r_set6, effect:pool_r_set7, effect:pool_r_set8 ,effect:pool_r_set9.
 effect:pool_r_set5 :device dev:q3; :deviceAttr :color; :scaledValue "#ffffff" .
 effect:pool_r_set6 :device dev:q3; :deviceAttr :rx; :value 0.683 .
 effect:pool_r_set7 :device dev:q3; :deviceAttr :ry; :value 0.022 .
 effect:pool_r_set8 :device dev:q3; :deviceAttr :zoom; :value 0.879 .
+effect:pool_r_set9 :device dev:q3; :deviceAttr :focus; :value 0.5 .
diff --git a/show/dance2017/effect/q1_3boost.n3 b/show/dance2017/effect/q1_3boost.n3
--- a/show/dance2017/effect/q1_3boost.n3
+++ b/show/dance2017/effect/q1_3boost.n3
@@ -18,6 +18,6 @@ effect:q1_3boost_set4 :device dev:q1; :d
 effect:q1_3boost_set5 :device dev:q3; :deviceAttr :focus; :value 0.297 .
 effect:q1_3boost_set6 :device dev:q3; :deviceAttr :rx; :value 0.667 .
 effect:q1_3boost_set7 :device dev:q1; :deviceAttr :ry; :value 0.436 .
-effect:q1_3boost_set8 :device dev:q3; :deviceAttr :zoom; :value 0.207 .
-effect:q1_3boost_set9 :device dev:q3; :deviceAttr :ry; :value 0.436 .
+effect:q1_3boost_set8 :device dev:q3; :deviceAttr :zoom; :value 0.307 .
+effect:q1_3boost_set9 :device dev:q3; :deviceAttr :ry; :value 0.03 .
 
diff --git a/show/dance2017/effect/qfill.n3 b/show/dance2017/effect/qfill.n3
--- a/show/dance2017/effect/qfill.n3
+++ b/show/dance2017/effect/qfill.n3
@@ -9,12 +9,11 @@
 
 effect:qfill a :Effect;
      rdfs:label "qfill"; :publishAttr :strength;
-     :setting effect:qfill_set0, effect:qfill_set1, effect:qfill_set10, effect:qfill_set11, effect:qfill_set12, effect:qfill_set2, effect:qfill_set3, effect:qfill_set4, effect:qfill_set5, effect:qfill_set6, effect:qfill_set7, effect:qfill_set8, effect:qfill_set9 .
+     :setting effect:qfill_set0, effect:qfill_set1, effect:qfill_set10, effect:qfill_set11, effect:qfill_set12, effect:qfill_set13, effect:qfill_set14, effect:qfill_set2, effect:qfill_set3, effect:qfill_set4, effect:qfill_set5, effect:qfill_set6, effect:qfill_set7, effect:qfill_set8, effect:qfill_set9 .
 effect:qfill_set0 :device dev:q1; :deviceAttr :rx; :value 0.248 .
 effect:qfill_set1 :device dev:q1; :deviceAttr :ry; :value 0.475 .
 effect:qfill_set10 :device dev:q3; :deviceAttr :color; :scaledValue "#f2a58f" .
 effect:qfill_set11 :device dev:q2; :deviceAttr :color; :scaledValue "#f2a58f" .
-effect:qfill_set12 :device dev:q2; :deviceAttr :focus; :value 0.971 .
 effect:qfill_set2 :device dev:q2; :deviceAttr :rx; :value 0.513 .
 effect:qfill_set3 :device dev:q2; :deviceAttr :ry; :value 0.482 .
 effect:qfill_set4 :device dev:q2; :deviceAttr :zoom; :value 0.405 .
@@ -23,3 +22,7 @@ effect:qfill_set6 :device dev:q3; :devic
 effect:qfill_set7 :device dev:q3; :deviceAttr :zoom; :value 0.395 .
 effect:qfill_set8 :device dev:q1; :deviceAttr :zoom; :value 0.319 .
 effect:qfill_set9 :device dev:q1; :deviceAttr :color; :scaledValue "#f2a58f" .
+
+effect:qfill_set12 :device dev:q1; :deviceAttr :focus; :value 0.971 .
+effect:qfill_set13 :device dev:q2; :deviceAttr :focus; :value 0.971 .
+effect:qfill_set14 :device dev:q3; :deviceAttr :focus; :value 0.971 .
diff --git a/show/dance2017/song7.n3 b/show/dance2017/song7.n3
--- a/show/dance2017/song7.n3
+++ b/show/dance2017/song7.n3
@@ -7,11 +7,17 @@
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-show:song7 :note <http://light9.bigasterisk.com/show/dance2017/song7/n1>, <http://light9.bigasterisk.com/show/dance2017/song7/n10>, <http://light9.bigasterisk.com/show/dance2017/song7/n11>, <http://light9.bigasterisk.com/show/dance2017/song7/n12>, <http://light9.bigasterisk.com/show/dance2017/song7/n13>, <http://light9.bigasterisk.com/show/dance2017/song7/n14>, <http://light9.bigasterisk.com/show/dance2017/song7/n15>, <http://light9.bigasterisk.com/show/dance2017/song7/n16>, <http://light9.bigasterisk.com/show/dance2017/song7/n2>, <http://light9.bigasterisk.com/show/dance2017/song7/n3>, <http://light9.bigasterisk.com/show/dance2017/song7/n4>, <http://light9.bigasterisk.com/show/dance2017/song7/n5>, <http://light9.bigasterisk.com/show/dance2017/song7/n6>, <http://light9.bigasterisk.com/show/dance2017/song7/n7>, <http://light9.bigasterisk.com/show/dance2017/song7/n8>, <http://light9.bigasterisk.com/show/dance2017/song7/n9> .
+show:song7 :note <http://light9.bigasterisk.com/show/dance2017/song7/n1>, <http://light9.bigasterisk.com/show/dance2017/song7/n10>, <http://light9.bigasterisk.com/show/dance2017/song7/n11>, <http://light9.bigasterisk.com/show/dance2017/song7/n12>, <http://light9.bigasterisk.com/show/dance2017/song7/n13>, <http://light9.bigasterisk.com/show/dance2017/song7/n14>, <http://light9.bigasterisk.com/show/dance2017/song7/n15>, <http://light9.bigasterisk.com/show/dance2017/song7/n16>, <http://light9.bigasterisk.com/show/dance2017/song7/n18>, <http://light9.bigasterisk.com/show/dance2017/song7/n2>, <http://light9.bigasterisk.com/show/dance2017/song7/n3>, <http://light9.bigasterisk.com/show/dance2017/song7/n4>, <http://light9.bigasterisk.com/show/dance2017/song7/n5>, <http://light9.bigasterisk.com/show/dance2017/song7/n6>, <http://light9.bigasterisk.com/show/dance2017/song7/n7>, <http://light9.bigasterisk.com/show/dance2017/song7/n9> .
 
 <http://light9.bigasterisk.com/show/dance2017/song7/n0> a :Note; :curve <http://light9.bigasterisk.com/show/dance2017/song7/n0c0>;
      :effectClass effect:downback; :originTime 516.237 .
 
+<http://light9.bigasterisk.com/show/dance2017/song7/n17> a :Note; :curve <http://light9.bigasterisk.com/show/dance2017/song7/n17c0>;
+     :effectClass effect:brush; :originTime 66.889 .
+
+<http://light9.bigasterisk.com/show/dance2017/song7/n8> a :Note; :curve <http://light9.bigasterisk.com/show/dance2017/song7/n8c0>;
+     :effectClass effect:pinwheel; :originTime 259.408 .
+
 <http://light9.bigasterisk.com/show/dance2017/song7/n0c0> a :Curve;
      :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song7/n0c0p0>, <http://light9.bigasterisk.com/show/dance2017/song7/n0c0p1>, <http://light9.bigasterisk.com/show/dance2017/song7/n0c0p2>, <http://light9.bigasterisk.com/show/dance2017/song7/n0c0p3> .
 <http://light9.bigasterisk.com/show/dance2017/song7/n0c0p0> :time 0.000;
@@ -65,9 +71,9 @@ show:song7 :note <http://light9.bigaster
      :value 0.000 .
 <http://light9.bigasterisk.com/show/dance2017/song7/n12c0p1> :time 4.280;
      :value 1.000 .
-<http://light9.bigasterisk.com/show/dance2017/song7/n12c0p2> :time 49.232;
+<http://light9.bigasterisk.com/show/dance2017/song7/n12c0p2> :time 62.009;
      :value 1.000 .
-<http://light9.bigasterisk.com/show/dance2017/song7/n12c0p3> :time 58.458;
+<http://light9.bigasterisk.com/show/dance2017/song7/n12c0p3> :time 64.121;
      :value 0.000 .
 
 <http://light9.bigasterisk.com/show/dance2017/song7/n13> a :Note; :curve <http://light9.bigasterisk.com/show/dance2017/song7/n13c0>;
@@ -91,7 +97,7 @@ show:song7 :note <http://light9.bigaster
      :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song7/n14c0p0>, <http://light9.bigasterisk.com/show/dance2017/song7/n14c0p1>, <http://light9.bigasterisk.com/show/dance2017/song7/n14c0p2>, <http://light9.bigasterisk.com/show/dance2017/song7/n14c0p3> .
 <http://light9.bigasterisk.com/show/dance2017/song7/n14c0p0> :time 0.000;
      :value 0.000 .
-<http://light9.bigasterisk.com/show/dance2017/song7/n14c0p1> :time 9.416;
+<http://light9.bigasterisk.com/show/dance2017/song7/n14c0p1> :time 6.561;
      :value 1.000 .
 <http://light9.bigasterisk.com/show/dance2017/song7/n14c0p2> :time 37.865;
      :value 1.000 .
@@ -123,7 +129,32 @@ show:song7 :note <http://light9.bigaster
      :value 1.000 .
 <http://light9.bigasterisk.com/show/dance2017/song7/n16c0p2> :time 14.018;
      :value 1.000 .
-<http://light9.bigasterisk.com/show/dance2017/song7/n16c0p3> :time 21.027;
+<http://light9.bigasterisk.com/show/dance2017/song7/n16c0p3> :time 16.514;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2017/song7/n17c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song7/n17c0p0>, <http://light9.bigasterisk.com/show/dance2017/song7/n17c0p1>, <http://light9.bigasterisk.com/show/dance2017/song7/n17c0p2>, <http://light9.bigasterisk.com/show/dance2017/song7/n17c0p3> .
+<http://light9.bigasterisk.com/show/dance2017/song7/n17c0p0> :time 0.000;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2017/song7/n17c0p1> :time 9.985;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song7/n17c0p2> :time 19.970;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song7/n17c0p3> :time 29.955;
+     :value 0.000 .
+
+<http://light9.bigasterisk.com/show/dance2017/song7/n18> a :Note; :curve <http://light9.bigasterisk.com/show/dance2017/song7/n18c0>;
+     :effectClass effect:strobeturn; :originTime 286.740 .
+
+<http://light9.bigasterisk.com/show/dance2017/song7/n18c0> a :Curve;
+     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song7/n18c0p0>, <http://light9.bigasterisk.com/show/dance2017/song7/n18c0p1>, <http://light9.bigasterisk.com/show/dance2017/song7/n18c0p2>, <http://light9.bigasterisk.com/show/dance2017/song7/n18c0p3> .
+<http://light9.bigasterisk.com/show/dance2017/song7/n18c0p0> :time -19.845;
+     :value 0.000 .
+<http://light9.bigasterisk.com/show/dance2017/song7/n18c0p1> :time -18.483;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song7/n18c0p2> :time 6.274;
+     :value 1.000 .
+<http://light9.bigasterisk.com/show/dance2017/song7/n18c0p3> :time 11.576;
      :value 0.000 .
 
 <http://light9.bigasterisk.com/show/dance2017/song7/n1c0> a :Curve;
@@ -188,11 +219,11 @@ show:song7 :note <http://light9.bigaster
      :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song7/n5c0p0>, <http://light9.bigasterisk.com/show/dance2017/song7/n5c0p1>, <http://light9.bigasterisk.com/show/dance2017/song7/n5c0p2>, <http://light9.bigasterisk.com/show/dance2017/song7/n5c0p3> .
 <http://light9.bigasterisk.com/show/dance2017/song7/n5c0p0> :time 0.000;
      :value 0.000 .
-<http://light9.bigasterisk.com/show/dance2017/song7/n5c0p1> :time 4.356;
+<http://light9.bigasterisk.com/show/dance2017/song7/n5c0p1> :time 2.731;
      :value 1.000 .
-<http://light9.bigasterisk.com/show/dance2017/song7/n5c0p2> :time 16.146;
+<http://light9.bigasterisk.com/show/dance2017/song7/n5c0p2> :time 31.933;
      :value 1.000 .
-<http://light9.bigasterisk.com/show/dance2017/song7/n5c0p3> :time 18.106;
+<http://light9.bigasterisk.com/show/dance2017/song7/n5c0p3> :time 33.893;
      :value 0.000 .
 
 <http://light9.bigasterisk.com/show/dance2017/song7/n6> a :Note; :curve <http://light9.bigasterisk.com/show/dance2017/song7/n6c0>;
@@ -200,9 +231,9 @@ show:song7 :note <http://light9.bigaster
 
 <http://light9.bigasterisk.com/show/dance2017/song7/n6c0> a :Curve;
      :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song7/n6c0p0>, <http://light9.bigasterisk.com/show/dance2017/song7/n6c0p1>, <http://light9.bigasterisk.com/show/dance2017/song7/n6c0p2>, <http://light9.bigasterisk.com/show/dance2017/song7/n6c0p3> .
-<http://light9.bigasterisk.com/show/dance2017/song7/n6c0p0> :time -9.010;
+<http://light9.bigasterisk.com/show/dance2017/song7/n6c0p0> :time 6.948;
      :value 0.000 .
-<http://light9.bigasterisk.com/show/dance2017/song7/n6c0p1> :time -3.812;
+<http://light9.bigasterisk.com/show/dance2017/song7/n6c0p1> :time 12.146;
      :value 1.000 .
 <http://light9.bigasterisk.com/show/dance2017/song7/n6c0p2> :time 21.391;
      :value 1.000 .
@@ -223,14 +254,11 @@ show:song7 :note <http://light9.bigaster
 <http://light9.bigasterisk.com/show/dance2017/song7/n7c0p3> :time 26.104;
      :value 0.000 .
 
-<http://light9.bigasterisk.com/show/dance2017/song7/n8> a :Note; :curve <http://light9.bigasterisk.com/show/dance2017/song7/n8c0>;
-     :effectClass effect:pinwheel; :originTime 259.408 .
-
 <http://light9.bigasterisk.com/show/dance2017/song7/n8c0> a :Curve;
      :attr :strength; :point <http://light9.bigasterisk.com/show/dance2017/song7/n8c0p0>, <http://light9.bigasterisk.com/show/dance2017/song7/n8c0p1>, <http://light9.bigasterisk.com/show/dance2017/song7/n8c0p2>, <http://light9.bigasterisk.com/show/dance2017/song7/n8c0p3> .
-<http://light9.bigasterisk.com/show/dance2017/song7/n8c0p0> :time -8.185;
+<http://light9.bigasterisk.com/show/dance2017/song7/n8c0p0> :time 7.500;
      :value 0.000 .
-<http://light9.bigasterisk.com/show/dance2017/song7/n8c0p1> :time 5.713;
+<http://light9.bigasterisk.com/show/dance2017/song7/n8c0p1> :time 8.709;
      :value 1.000 .
 <http://light9.bigasterisk.com/show/dance2017/song7/n8c0p2> :time 37.470;
      :value 1.000 .