diff --git a/show/dance2018/song16.n3 b/show/dance2018/song16.n3
--- a/show/dance2018/song16.n3
+++ b/show/dance2018/song16.n3
@@ -228,8 +228,8 @@ song:n28 a :Note; :curve song:n28c0; :ef
      :originTime 5.3264e+01; :setting song:n28set0 .
 
 song:n28c0 a :Curve; :attr :strength; :point song:n28c0p0, song:n28c0p1, song:n28c0p2, song:n28c0p3 .
-song:n28c0p0 :time 3.4236e+01; :value 0e+00 .
-song:n28c0p1 :time 3.6894e+01; :value 1e+00 .
+song:n28c0p0 :time 3.6088e+01; :value 0e+00 .
+song:n28c0p1 :time 3.9796e+01; :value 1e+00 .
 song:n28c0p2 :time 1.44477e+02; :value 1e+00 .
 song:n28c0p3 :time 1.46422e+02; :value 0e+00 .
 song:n28set0 :effectAttr :colorScale; :value "#ff4a18" .
diff --git a/show/dance2018/song2.n3 b/show/dance2018/song2.n3
--- a/show/dance2018/song2.n3
+++ b/show/dance2018/song2.n3
@@ -4,21 +4,26 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix show: <http://light9.bigasterisk.com/show/dance2018/> .
+@prefix song: <http://light9.bigasterisk.com/show/dance2018/song2/> .
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
-show:song2 :note <http://light9.bigasterisk.com/show/dance2018/song2/n0> .
+show:song2 :note song:n0, song:n1 .
+
+song:n0 a :Note; :curve song:n0c0; :effectClass effect:combine1; :originTime 4.5036e+01 .
 
-<http://light9.bigasterisk.com/show/dance2018/song2/n0> a :Note; :curve <http://light9.bigasterisk.com/show/dance2018/song2/n0c0>;
-     :effectClass effect:combine1; :originTime 4.5036e+01 .
+song:n0c0 a :Curve; :attr :strength; :point song:n0c0p0, song:n0c0p1, song:n0c0p2, song:n0c0p3 .
+song:n0c0p0 :time -4.1624e+01; :value 0e+00 .
+song:n0c0p1 :time -3.9059e+01; :value 1e+00 .
+song:n0c0p2 :time 1.1822e+02; :value 1e+00 .
+song:n0c0p3 :time 1.2064e+02; :value 0e+00 .
 
-<http://light9.bigasterisk.com/show/dance2018/song2/n0c0> a :Curve;
-     :attr :strength; :point <http://light9.bigasterisk.com/show/dance2018/song2/n0c0p0>, <http://light9.bigasterisk.com/show/dance2018/song2/n0c0p1>, <http://light9.bigasterisk.com/show/dance2018/song2/n0c0p2>, <http://light9.bigasterisk.com/show/dance2018/song2/n0c0p3> .
-<http://light9.bigasterisk.com/show/dance2018/song2/n0c0p0> :time -4.1624e+01;
-     :value 0e+00 .
-<http://light9.bigasterisk.com/show/dance2018/song2/n0c0p1> :time -4.1077e+01;
-     :value 1e+00 .
-<http://light9.bigasterisk.com/show/dance2018/song2/n0c0p2> :time 1.1822e+02;
-     :value 1e+00 .
-<http://light9.bigasterisk.com/show/dance2018/song2/n0c0p3> :time 1.2064e+02;
-     :value 0e+00 .
+song:n1 a :Note; :curve song:n1c1; :effectClass effect:bow; :originTime 1.19413e+02;
+     :setting song:n1set0 .
+
+song:n1c1 a :Curve; :attr :strength; :point song:n1c1p1, song:n1c1p2, song:n1c1p3, song:n1c1p4 .
+song:n1c1p1 :time 3.7962e+01; :value 0e+00 .
+song:n1c1p2 :time 3.8754e+01; :value 1e+00 .
+song:n1c1p3 :time 4.3894e+01; :value 1e+00 .
+song:n1c1p4 :time 4.634e+01; :value 0e+00 .
+song:n1set0 :effectAttr :colorScale; :value "#ffffff" .
diff --git a/show/dance2018/song4.n3 b/show/dance2018/song4.n3
--- a/show/dance2018/song4.n3
+++ b/show/dance2018/song4.n3
@@ -23,6 +23,6 @@ song:n1 a :Note; :curve song:n1c1; :effe
 
 song:n1c1 a :Curve; :attr :strength; :point song:n1c1p1, song:n1c1p2, song:n1c1p3, song:n1c1p4 .
 song:n1c1p1 :time -1.50154e+02; :value 0e+00 .
-song:n1c1p2 :time -1.48154e+02; :value 1e+00 .
+song:n1c1p2 :time -1.46773e+02; :value 1e+00 .
 song:n1c1p3 :time 6.9357e+01; :value 1e+00 .
 song:n1c1p4 :time 7.2406e+01; :value 0e+00 .
diff --git a/show/dance2018/song7.n3 b/show/dance2018/song7.n3
--- a/show/dance2018/song7.n3
+++ b/show/dance2018/song7.n3
@@ -14,6 +14,8 @@ song:n0 a :Note; :curve song:n0c0; :effe
 
 song:n1 a :Note; :curve song:n1c0; :effectClass effect:effect1; :originTime 4.0406e+01 .
 
+song:n7 a :Note; :curve song:n7c0; :effectClass effect:bow; :originTime 3.23909e+02 .
+
 song:n0c0 a :Curve; :attr :strength; :point song:n0c0p0, song:n0c0p1, song:n0c0p2, song:n0c0p3 .
 song:n0c0p0 :time 2.247e+00; :value 0e+00 .
 song:n0c0p1 :time 1.0062e+01; :value 1e+00 .
@@ -40,8 +42,8 @@ song:n3 a :Note; :curve song:n3c0; :effe
      :originTime 2.49082e+02; :setting song:n3set0 .
 
 song:n3c0 a :Curve; :attr :strength; :point song:n3c0p0, song:n3c0p1, song:n3c0p2, song:n3c0p3 .
-song:n3c0p0 :time -2.46957e+02; :value 0e+00 .
-song:n3c0p1 :time -2.37666e+02; :value 1e+00 .
+song:n3c0p0 :time -2.45218e+02; :value 0e+00 .
+song:n3c0p1 :time -2.35732e+02; :value 1e+00 .
 song:n3c0p2 :time 2.1348e+01; :value 1e+00 .
 song:n3c0p3 :time 2.9699e+01; :value 0e+00 .
 song:n3set0 :effectAttr :colorScale; :value "#ff8775" .
@@ -50,19 +52,19 @@ song:n4 a :Note; :curve song:n4c0; :effe
      :setting song:n4set0 .
 
 song:n4c0 a :Curve; :attr :strength; :point song:n4c0p0, song:n4c0p1, song:n4c0p2, song:n4c0p3 .
-song:n4c0p0 :time -1.4253e+01; :value 0e+00 .
-song:n4c0p1 :time 4.264e+00; :value 1e+00 .
+song:n4c0p0 :time 3.6307e+01; :value 0e+00 .
+song:n4c0p1 :time 3.6598e+01; :value 1e+00 .
 song:n4c0p2 :time 8.5732e+01; :value 1e+00 .
 song:n4c0p3 :time 9.9141e+01; :value 0e+00 .
-song:n4set0 :effectAttr :colorScale; :value "#5c4e83" .
+song:n4set0 :effectAttr :colorScale; :value "#831a00" .
 
 song:n5 a :Note; :curve song:n5c0; :effectClass effect:cyc; :originTime 2.89929e+02 .
 
 song:n5c0 a :Curve; :attr :strength; :point song:n5c0p0, song:n5c0p1, song:n5c0p2, song:n5c0p3 .
 song:n5c0p0 :time -1.7849e+01; :value 0e+00 .
 song:n5c0p1 :time -9.93e+00; :value 1e+00 .
-song:n5c0p2 :time 4.46e+01; :value 1e+00 .
-song:n5c0p3 :time 5.955e+01; :value 0e+00 .
+song:n5c0p2 :time 2.2643e+01; :value 1e+00 .
+song:n5c0p3 :time 3.2886e+01; :value 0e+00 .
 
 song:n6 a :Note; :curve song:n6c1; :effectClass effect:allwide; :originTime 3.144786e+02 .
 
@@ -71,3 +73,9 @@ song:n6c1p1 :time -2e+00; :value 0e+00 .
 song:n6c1p2 :time 2.233e+01; :value 1e+00 .
 song:n6c1p3 :time 4.5201e+01; :value 1e+00 .
 song:n6c1p4 :time 4.6132e+01; :value 0e+00 .
+
+song:n7c0 a :Curve; :attr :strength; :point song:n7c0p0, song:n7c0p1, song:n7c0p2, song:n7c0p3 .
+song:n7c0p0 :time 0e+00; :value 0e+00 .
+song:n7c0p1 :time 7.946e+00; :value 1e+00 .
+song:n7c0p2 :time 1.5891e+01; :value 1e+00 .
+song:n7c0p3 :time 2.3837e+01; :value 0e+00 .