1 files changed, 24 insertions, 16 deletions
diff --git a/02-song2/parts/keys.ly b/02-song2/parts/keys.ly
index 155d820..0792e24 100644
--- a/02-song2/parts/keys.ly
+++ b/02-song2/parts/keys.ly
@@ -62,28 +62,36 @@ keysReprise = \relative c' {
   }
 }
 
-keysFinal = \transpose c d { \relative c' {
+keysFinal = \relative c' {
   \repeat volta 4 {
     %% TODO: simplify + use more simple arpeggios
-    \tuplet 6/2 { g'8 e cis g e b } e,2   b'16 cis fis8 |
-    g16 c e c e fis g8 ~ g2 |
+    \tuplet 6/2 { a'8 fis dis a fis cis } fis,2   cis'16 dis gis8 |
+    a16 d fis d fis gis a8 ~ a2 |
 
-    \tuplet 6/2 { b8 g e b e, cis }
-    b16 e, a cis g' b e fis g a b c
-    <b g >16 r8 <a fis >16 r8 g16 fis e b g e b4
+    \tuplet 6/2 { cis8 a fis cis fis, dis }
+    cis16 fis, b dis a' cis fis gis a b cis d
+    <cis a>16 r8 <b gis>16 r8 a16 gis fis cis a fis cis4
   }
 
   %% TODO: simplify more!
-  <a'' e,, cis a >16 g
-  e cis a' e cis e cis a e a e cis a e
-  <c'' g, e c >4*1/6
-  g e g e c e c g c g
-  <d' a g g, >4*1/6 e g b g b d b d e fis16 g
-
-  <a e,, cis a >16 g
-  e cis a' e cis e cis a e a e cis a e
-  dis8 a' r8 c'16 dis fis1.
-}}
+  %% TODO: move these commented chords to stick?
+  %% <fis,, dis b>
+  b''16 a
+  fis dis b' fis dis fis dis b fis b fis dis b fis
+
+  %% <a, fis d>
+  d''4*1/6 a fis a fis d
+  fis d a d a
+
+  %% <e b a a,>
+  e'4*1/6 fis a cis a cis
+  e cis e fis gis16 a
+
+  %% <fis,, dis b>
+  b16 a
+  fis dis b' fis dis fis dis b fis b fis dis b fis
+  f8 b' r8 d16 f gis1.
+}
 
 keyboard = \new PianoStaff <<
   \new Staff \relative c' {