diff --git a/lost-in-time.ly b/lost-in-time.ly
index a88bfdf..e37886c 100644
--- a/lost-in-time.ly
+++ b/lost-in-time.ly
@@ -18,13 +18,10 @@ globalConfig = {
 }
 
 tappingRiff = \relative c {
-  \times 4/6 { a16( d e a^"+" e d }
-  \repeat unfold 3 { \times 4/6 { a d e a^"+" e d } }
-
-  \repeat unfold 4 { \times 4/6 { a e' f c'^"+" f, e } }
-  \repeat unfold 4 { \times 4/6 { a, g' a b^"+" a g } }
-  \repeat unfold 3 { \times 4/6 { a, fs' a d^"+" a fs } }
-  \times 4/6 { a, fs' a d^"+" a fs) }
+  \repeat unfold 4 { \times 4/6 { a16( d e) a^"+"( e d) } }
+  \repeat unfold 4 { \times 4/6 { a( e' f) c'^"+"( f, e) } }
+  \repeat unfold 4 { \times 4/6 { a,( g' a) b^"+"( a g) } }
+  \repeat unfold 4 { \times 4/6 { a,( fs' a) d^"+"( a fs) } }
 }
 
 pedalToneRiff = \relative c {
@@ -40,25 +37,211 @@ pedalToneRiff = \relative c {
 }
 
 fToDRiff = \relative c, {
-  \repeat volta 2 {
-    f16 c' f a c a b g f g f e d b c a |
-    g d' g b d b c a g a g f e c d b |
-    bf f' bf d f d e c bf\glissando( c) g' d' f d e c |
-  }
-  \alternative {
-    { d2 \times 4/6 { a'16( f) d a f d } \times 2/3 { c b! a } g8 | }
-    { d''2 \times 4/6 { bf,16 c d e f g } \times 4/6 { a bf c d e f } | }
-  }
+  f16 c' f a c a b g f g f e d b c a |
+  g d' g b d b c a g a g f e c d b |
+  bf f' bf d f d e c bf\glissando( c) g' d' f d e c |
+}
+
+fToDFirstAlternate = \relative c'' {
+  d2 \times 4/6 { a'16( f) d a f d } \times 2/3 { c b! a } g8 |
+}
+fToDSecondAlternate = \relative c'' {
+  d2 \times 4/6 { bf,16 c d e f g } \times 4/6 { a bf c d e f } | |
 }
 
 fToGWeirdTime = \relative c, {
-  \time 3/4 f8. c'16 ~ c8 g' ~ g16 c,8. |
-  \time 5/8 g8. d'16 ~ d8 c' b |
+  f8.[ c'] g'[ c,] g[ d'] c'8[ b] |
+}
+
+preChorusRiff = \relative c {
+  a8.[ a'] a,8[ b] c8.[ e] <b' e>4. |
+  d,8.[ g] a[ d,] g,[ b] c8[ b] |
+  a8.[ a'] a,8[ b] c8.\glissando[ d] <cs a'>4 d16( e) |
+  f8.[ a] b[ c!] <g d'>[ q] <fs d'>4 |
+}
+
+chorusRiff = \relative c, {
+  f8.[ a] c[ f,] g[ b] d16[ c b a] |
+  g8.[ b] d[ g,] g[ c] e16[ d c b] |
+  a8.[ cs] e[ a,] a[ d] f16[ e d c] |
+  \time 4/4 <g c g'>2 <g d' g> |
+  \time 11/8
+  f'16[ f f a a a] c[ c c f, f f ] g[ g g b b b] \tuplet 6/4 { d[ c b c b a] } |
+  g[ g g b b b] d[ d d g, g g ] g[ g g c c c] e32( f e) d e d c b |
+  a16[ a a cs cs cs] e[ e e a, a a] a[ a a d d d] f8[ d] |
+  \time 4/4 e16 g c g e' c g'( e) \tuplet 6/4 4 { f16 e d c b a g f e d c b } |
+}
+
+rhythmChorus = \relative c, {
+  <f c' f>2. <g d' g>4. q8[ q] |
+  q2. <g c g'>4. q8[ q] |
+  <a e' a>2. <a d a'>4. q8[ q] |
+  \time 4/4 <c g' c>2 <b g' b> |
+}
+
+amElevenArpeggio = \relative c {
+  a8. ~ <a e'>16 ~ q8 ~ <a e' g>8 ~ q16 ~ <a e' g c>8. ~ <a e' g c d>4\fermata |
 }
 
 guitarOne = {
   \relative c {
-    %{
+    \repeat unfold 3 \tappingRiff
+    \amElevenArpeggio
+
+    \repeat volta 2 \pedalToneRiff
+
+    \repeat volta 2 {
+      a8^"clean" e'16 a ~ a b e8 ~ e2 |
+      a,,8 f'16 a ~ a b f'8 ~ f2 |
+      a,,8 g'16 b ~ b cs e8 ~ e2 |
+      g,8 c e c g b d b |
+      \time 11/8 \fToGWeirdTime
+    }
+
+    % verse 1
+    \time 4/4
+    a,8. e'16 ~ e8 a ~ a16 <b e>8. ~ q4 |
+    a,8. f'16 ~ f8 a ~ a16 <b e>8. ~ q4 |
+    a,8. g'16 ~ g8 b ~ b16 <b cs e>8. ~ q4 |
+    <g c! e>2 <g b d> |
+    \time 11/8 \fToGWeirdTime
+
+    \time 4/4
+    a,8 e' a b e b a e |
+    a, f' a b e b a f |
+    a, g' b cs e cs b g |
+    g c! e c g b d b |
+    \time 11/8 \fToGWeirdTime
+
+    \time 4/4
+
+    % verse 2
+    a8^"w/ dist" a16 \deadNote a a( g) e a ~ a8 a16 \deadNote a a( g) e a ~ |
+    a8 a16 \deadNote a a( g) e <g c> ~ q8 a,16 <g' c> ~ q <g b>8. |
+    a8 a16 \deadNote a a( g) e a ~ a8 a16 \deadNote a a( g) e a ~ |
+    a8 a16 \deadNote a a( g) e <a d> ~ q8 a,16 <a' d> ~ q <g cs>8. |
+    a8 a16 \deadNote a a( g) e a ~ a8 a16 \deadNote a a( g) e a ~ |
+    a8 a16 \deadNote a a( g) e <g c!> ~ <g c>8 a,16 <g' c> ~ q <g b>8. |
+    a8 a16 \deadNote a a( g) e a ~ a8 a16 \deadNote a a( g) e a ~ |
+    a8 a16 \deadNote a a( g) e <a d> ~ q8 a,16 <f' c'> ~ q <e c'>8. |
+    \time 11/8 <f, c' f>8.[ q8 e16] <f c' f>4. g16[ a b d8 a16] c8[ b] \bar "||" |
+
+    % pre-chorus
+    \preChorusRiff
+
+    \time 4/4
+    \repeat volta 2 \fToDRiff
+    \alternative {
+      { \fToDFirstAlternate }
+      { \fToDSecondAlternate }
+    }
+    e''1 |
+
+    % chorus
+    \time 11/8
+    \chorusRiff
+
+    a,,2 r2 | \repeat unfold 7 r1 |
+    % d minor stuff
+    \repeat unfold 6 r1
+    \key d \minor
+    % tapping
+    \repeat unfold 8 r1
+    % drones
+    \repeat unfold 8 r1
+
+    % verse 3
+    \time 3/4
+    \repeat unfold 16 r2.
+
+    % bridge
+    \time 4/4
+    \repeat unfold 7 r1
+    r2 r4 r8 r16 <a, e' a> ~ |
+
+    q1 |
+    <d a' d>2 <g, d' g d' g> |
+    <bf f' bf>8. q16 ~ q a <bf f' bf>8 ~ q4. q8 |
+    <<
+      { g'4  c d g | a1 } \\
+      { c,,4 e g c | d1 }
+    >>
+
+    % interlude
+    r1 | r1 | r1 |
+
+    \transpose a d' \pedalToneRiff
+
+    \time 11/8
+    f,8.[ f8 e16] f4. d'8.[ c] b8[ g] |
+    f8.[ c'] g'[ c,] g[ d'] c'8[ b] \bar "||" |
+
+    \key a \minor
+    % pre-chorus
+    \preChorusRiff
+    \time 4/4
+    \fToDRiff \fToDSecondAlternate
+    e1 |
+
+    \time 11/8
+    \chorusRiff
+
+    <a,,, e' a>8. q16 ~ q g16 <a e' a>8 ~ q4 a16 b c e |
+    <f c'>8. q16 ~ q <e c'>16 <f c'>8 ~ q4 e16 f a b |
+    <g c>8. q16 ~ q <g b>16 <g c>8 ~ q4 c16 d c b |
+    \time 11/8 c16[ b a b( a) g] a[ g f g f e] f[( e) d e d c] d[ c b g] |
+
+    % chorus again
+    <f c' f>8.[ q] q[ q] <g d' g>[ q] g16[ g g g] |
+    <g d' g>8.[ q] q[ q] <c g'>[ q] c16[ c c c] |
+    <cs a'>8.[ q] q[ q] <d a'>[ q] d16[ d d d] |
+    \time 4/4 <c! g' c!>2 <g d' g d' g> |
+    \time 11/8 f16[ f f f f f] f[ f f f f f] g[ g g g g g] g[ g g g] |
+    g[ g g g g g] g[ g g g g g] g[ g g g g g] g[ g g g] |
+    a[ a a a a a] a[ a a a a a] a[ a a a a a] a[ d e f] |
+    \time 4/4 e4 d c b |
+
+    % outro
+    \pedalToneRiff
+
+    \time 11/8
+    f'8.[ f8 e16] f4. d'8.[ c] b8[ g] |
+    \transpose c c' \fToGWeirdTime
+    a'1 | \repeat unfold 7 r1 |
+    r1\fermata \bar "|." |
+  }
+}
+
+guitarTwo = {
+  \relative c {
+    r1 | r1 | r1 | r1 |
+    a2 b4 c | b2 c | d1 ~ | d |
+    e2 d4 c | d2 c | b1 | a1 ~ |
+    a1\fermata |
+
+    % pedal tone riff
+    \repeat volta 2 { \repeat unfold 8 r1 }
+    \repeat volta 2 { r1 | r1 | r1 | r1 | \time 11/8 r1 r4. | }
+    % verse 1
+    \repeat unfold 2 { r1 | r1 | r1 | r1 | \time 11/8 r1 r4. | }
+    % verse 2
+    \repeat unfold 8 { r1 }
+    \time 11/8 r1 r4. |
+
+    % pre-chorus
+    \repeat unfold 4 { r1 r4. }
+
+    % f-to-d riff
+    \time 4/4
+    \repeat volta 2 { r1 | r1 | r1 } \alternative { { r1 } { r1 } }
+    r1 |
+
+    % chorus
+    \time 11/8 \repeat unfold 3 { r1 r4. | }
+    \time 4/4 r1
+    \rhythmChorus
+
+    % post-chorus modulation to D
     \repeat unfold 2 { a16 e' a e a e a, e' }
     c e b' e, b' e, c e c e c' e, c' e, c e
     \repeat unfold 2 { d g a g a g d g }
@@ -77,181 +260,81 @@ guitarOne = {
     a2. ~ a8 g16( a) |
     bf4. a16( g) f4 e4 |
 
+    \key d \minor
     \repeat unfold 2 { \transpose a d' \tappingRiff }
 
-    \repeat volta 2 { <d, a'>1 | <d bf'> | <d c'> | <d b'!> | }
+    \repeat unfold 2 { <d, a'>1 | <d bf'> | <d c'> | <d b'> | }
 
-    \repeat volta 2 { \repeat unfold 10 { <d a'>16 q r } c'32( g) g( d) | }
-
-    \repeat volta 2 {
-      e,32 e e16 e e f( e) e e a32 a gs16 e e b'32 b a16 c b |
-    }
-    \alternative {
-      { e,32 e e16 e e f( e) e <d' a' d> ~ q <c g' c>8 e,16 <g! d' g!>\glissando( <a e' a>) q8 | }
-      { e32 e e16 e e f( e) e e \times 4/6 { d' e f gs a b } \times 4/6 { d e f gs a b } }
+    % verse 3
+    \time 3/4
+    \repeat unfold 4 {
+      \repeat unfold 4 { d16 f a } |
+      \repeat unfold 4 { d,16 f bf } |
+      \repeat unfold 4 { d,16 g c } |
+      \repeat unfold 4 { d,16 g b } |
     }
 
-    e,,,32 e e16 e e f32 f e16 e e a32 a gs16 b32 b a16 c32 c b16 d32 d c16 |
-    e,32 e e16 e e f32 f e16 e <d' a' d> ~ q <c g' c>8 e,16 <g! d' g!>\glissando( <a e' a>) q8 |
-    e32 e e16 e e f32 f e16 e a32 a gs16 gs b32 b a16 a c32 c b16 b |
-    e,32 e e16 e e f32 f e16 e e \times 4/6 { d' e f gs a b } \times 4/6 { d e f e d b } |
-
-    \repeat unfold 2 { \repeat unfold 10 { <a, e'>16 q r } g'32( d) d( a) | }
-
-    % solo
-    \repeat unfold 4 { \repeat unfold 10 { <a e'>16 q r } g'32( d) d( a) | }
-%}
-
-    \repeat unfold 3 { \tappingRiff }
-    a8. ~ <a e'>16 ~ q8 <a e' g>8 ~ q16 ~ <a e' g c>8. ~ <a e' g c g'>4\fermata  |
-
-    \repeat volta 2 \pedalToneRiff
-
-    \repeat volta 2 {
-      a8^"clean" e'16 a ~ a b e8 ~ e2 |
-      a,,8 f'16 a ~ a b f'8 ~ f2 |
-      a,,8 g'16 b ~ b cs e8 ~ e2 |
-      g,8 c e c g b d b |
-      \fToGWeirdTime
-    }
-
-    % verse 1
+    % bridge
     \time 4/4
-    a,8. e'16 ~ e8 a ~ a16 <b e>8. ~ q4 |
-    a,8. f'16 ~ f8 a ~ a16 <b e>8. ~ q4 |
-    a,8. g'16 ~ g8 b ~ b16 <b cs e>8. ~ q4 |
-    <g c! e>2 <g b d> |
-    \fToGWeirdTime
+    bf,!8 f' e16( f e) bf ~ bf8 f' e16( f e) c ~ |
+    c8 g' f16( g f) c ~ c8 g' f16( g f) bf, ~ |
+    bf8 f' e16( f e) bf ~ bf8 f' e16( f e) c ~ |
+    c8 g' f16( g f) c ~ c8 g' f16( g f) df ~ |
+    df g af g af g af df, ~ df g af g af g df' ef, ~ |
+    ef af bf af bf af bf ef, ~ ef af bf af bf af ef' f, ~ |
+    f bf c bf c bf c f, ~ f bf c bf c bf f' g, ~ |
+    g c d c d c d g, ~ g c d c d c g' a, ~ |
 
-    \time 4/4
-    a,8 e' a b e b a e |
-    a, f' a b e b a f |
-    a, g' b cs e cs b g |
-    g c! e c g b d b |
-    \fToGWeirdTime
+    a2 r2 | r1 | r1 | r1
 
-    \time 4/4
+    d16(^"interlude" g,) a( d,) g\glissando( a) g'( fs) a,( d,) a'\glissando( c) g'\glissando( f) bf,(\glissando a) |
+    f( a,) d( e) g\glissando( f) c'\glissando( d) f( e) c\glissando( d) g\glissando( a) c( b) |
+    g( a) d,( g,) a( d,) g\glissando( a) g'( fs) d( e\glissando f e) c g
+    g'( fs) d a c'( b) g d( e f) a c e( f e) c\glissando |
+    d2 r2 |
 
-    % verse 2
-    a8^"w/ dist" a16 \deadNote a a( g) e a ~ a8 a16 \deadNote a a( g) e a ~ |
-    a8 a16 \deadNote a a( g) e <g c> ~ q8 a,16 <g' c> ~ q <g b>8. |
-    a8 a16 \deadNote a a( g) e a ~ a8 a16 \deadNote a a( g) e a ~ |
-    a8 a16 \deadNote a a( g) e <a d> ~ q8 a,16 <a' d> ~ q <g cs>8. |
-    a8 a16 \deadNote a a( g) e a ~ a8 a16 \deadNote a a( g) e a ~ |
-    a8 a16 \deadNote a a( g) e <g c!> ~ <g c>8 a,16 <g' c> ~ q <g b>8. |
-    a8 a16 \deadNote a a( g) e a ~ a8 a16 \deadNote a a( g) e a ~ |
-    a8 a16 \deadNote a a( g) e <a d> ~ q8 a,16 <f' c'> ~ q <e c'>8. |
-    \time 3/4 <f, c' f>8. q16 ~ q e <f c' f>8 ~ q4 |
-    \time 5/8 g16[ a b] d8[ a16] c8 b \bar "||" |
+    % pedal riff
+    \repeat unfold 7 r1
 
     \time 11/8
-    % pre-chorus
-    a8.[ a'] a,8[ b] c8.[ e] <b' e>4. |
-    d,8.[ g] a[ d,] g,[ b] c8[ b] |
-    a8.[ a'] a,8[ b] c8.\glissando[ d] <cs a'>4 d16( e) |
-    f8.[ a] b[ c!] <g d'>[ q] <fs d'>4 |
+    <f,,, c' f>8.[ q8 e16] <f c' f>4. d'8.[ c] b8[ g] |
+    \fToGWeirdTime
 
+    \key a \minor
+    % pre-chorus
+    \bar "||"
+    a'4. r1 |
+    \repeat unfold 3 { r1 r4. }
+
+    % f to d riff
     \time 4/4
-    \fToDRiff
-    e''1 |
+    \repeat unfold 4 r1 |
+    r1 |
 
     % chorus
     \time 11/8
-  }
-}
+    \repeat unfold 3 { r1 r4. } \time 4/4 r1
 
-guitarTwo = {
-  \relative c {
-    %{
+    \rhythmChorus
 
-    % a minor pedal tone riff
-    \repeat unfold 8 r1
-    \repeat unfold 8 r1
-
-    % a minor ascending riff to a major
-    \repeat unfold 8 r1
-
-    % d minor stuff
-    \repeat unfold 4 r1
-    a16 d f a, d e a, d e a, cs e a, cs e cs |
-    g a bf a bf c d e f c' f e, c' e g, c, |
-
-    % d minor pedal tone
-    \repeat unfold 8 r1
-
-    % d minor pedal chords
-    \repeat volta 2 { \repeat unfold 4 r1 }
-
-    % d power chords in three
-    \repeat volta 2 { r1 | r1 | }
-
-    % e seventh stuff
-    \repeat volta 2 r1
-    \alternative {
-      { r1 | }
-      { r1 | }
+    r1 | r1 | r1 | \time 11/8 r1 r4. |
+    \repeat unfold 2 {
+      \repeat unfold 3 { r1 r4. } \time 4/4 r1
     }
 
-    \repeat unfold 4 r1
+    % outro
+    \repeat unfold 8 r1 |
+    \time 11/8
+    <f, c' f>8.[ q8 e16] <f c' f>4. d'8.[ c] b8[ g] |
+    \fToGWeirdTime
 
-    % solo
-    r1 | r1 | r1 |
-    r2 r4 r8 g''32^"solo" a bf g |
-
-    a4. g16 cs ~ cs4 g16 a bf d |
-    e4. f16 g ~ g4. d16 g |
-
-    a cs, e a, cs e, a cs, e' a, cs e, a cs, e a, |
-    g d' bf g' d bf' g d' e4. d16( c) |
-
-    a8 <c e>16 a <d fs> <c e>8 a16 ~ a a <c e> a \times 4/6 { d( c) a g e c } |
-    a8 <c e>16 a <d fs> <c e>8 a16 ~ a a <c e> a g e d e |
-
-    \times 4/6 { g, a bf cs d e } \times 4/6 { g a bf cs d e }
-    \times 4/6 { g, a bf cs d e } \times 4/6 { g a bf cs d e } |
-    d4 ~ d16 f,16( fs) d ~ d fs c' fs ~ fs8 c |
-
-    %}
-
-    r1 | r1 | r1 | r1 |
-    a2 b4 c | b2 c | d1 ~ | d |
-    e2 d4 c | d2 c | b1 | a1 ~ |
-    a1\fermata |
-
-    % pedal tone riff
-    \repeat volta 2 { \repeat unfold 8 r1 }
+    \time 4/4
+    \repeat unfold 2 \tappingRiff
+    \amElevenArpeggio \bar "|."
   }
 }
 
-vocalMelody = \relative c'' {
-  \repeat unfold 13 r1
-
-  \repeat volta 2 { \repeat unfold 8 r1 }
-  \repeat volta 2 { r1 | r1 | r1 | r1 | \time 3/4 r2. | \time 5/8 r2 r8 | }
-
-  a2.^"verse 1" c4 | b2. d4 | cs2. a4 | g1 | \time 3/4 r2. | \time 5/8 r2 r8 |
-  a2. c4 | b2. d4 | cs2. f4 | e1 | \time 3/4 r2. | \time 5/8 r2 r8 |
-
-  a,4^"verse 2" b8 c ~ c b4 a8 ~ | a g4 e8 ~ e4 r8 g |
-  a4 b8 c ~ c d4 cs8 ~ | cs d4 e8 ~ e f4 e8 ~ |
-  e4 r8 a, c!4. b8 ~ | b a4 d8 ~ d4 c8 b ~ |
-  b a4 g8 b4 b8 b ~ | b a g a ~ a2 |
-
-  \time 3/4 r2. | \time 5/8 r2 r8 |
-  \time 11/8
-
-  % pre-chorus
-  c4.^"pre-chorus" d8[ e] c8.[( d)] e4. |
-  d8.[ d] c[ c] b4. r4 |
-  c8.[ d] e8[ d] c8.[ d] e[ d] |
-  c[ a] b[ g] a4. ~ a4 |
-
-  \time 4/4
-  \repeat volta 2 { r1 | r1 | r1 } \alternative { { r1 } { r1 } }
-  r1 |
-
-  % chorus
-  \time 11/8
+chorusVocalMelody = \relative c'' {
   a8.[^"chorus" b] c[ a] b[ c] d4 |
   b8.[ c] d[ b] c[ d] e8. e16 |
   cs8.[ d] e[ cs] d[ e] f4 |
@@ -261,11 +344,121 @@ vocalMelody = \relative c'' {
   a8.[ b] c[ a] b[ c] d4 |
   b8.[ c] d[ b] c[ d] e4 |
   cs8.[ d] e[ cs] d[ e] f4 |
-  \time 4/4 <c e>2 <b d>2 |
+  \time 4/4 <c! e>2 <b d>2 |
+}
+
+vocalMelody = \relative c'' {
+  \repeat unfold 13 r1
+
+  \repeat volta 2 { \repeat unfold 8 r1 }
+  \repeat volta 2 { r1 | r1 | r1 | r1 | \time 11/8 r1 r4. | }
+
+  a2.^"verse 1" c4 | b2. d4 | cs2. a4 | g1 | \time 11/8 r1 r4. |
+  a2. c4 | b2. d4 | cs2. f4 | e1 | \time 11/8 r1 r4. |
+
+  a,4^"verse 2" b8 c ~ c b4 a8 ~ | a g4 e8 ~ e4 r8 g |
+  a4 b8 c ~ c d4 <cs \tweak font-size #-3 e>8 ~ |
+  q <d \tweak font-size #-3 f>4 <e \tweak font-size #-3 g>8 ~ q <f \tweak font-size #-3 a>4 <e \tweak font-size #-3 a>8 ~ |
+  q4 r8 a, <c! \tweak font-size #-3 e>4. <b \tweak font-size #-3 d>8 ~ |
+  q <a \tweak font-size #-3 c>4 <d \tweak font-size #-3 g>8 ~ q4 <c \tweak font-size #-3 e>8 <b \tweak font-size #-3 d> ~ |
+  q <a \tweak font-size #-3 c>4 g8 b4 b8 b ~ | b a g a ~ a2 |
+
+  \time 11/8 r1 r4. |
+
+  % pre-chorus
+  c4.^"pre-chorus" d8[ e] c8.[( d)] e4. |
+  d8.[ d] c[ c] b4. r4 |
+  <\tweak font-size #-3 a c>8.[ <\tweak font-size #-3 b d>] <\tweak font-size #-3 c e>8[ <\tweak font-size #-3 b d>]
+    <\tweak font-size #-3 a c>8.[ <\tweak font-size #-3 b d>] <\tweak font-size #-3 cs e>[ d] |
+  c![ a] b[ g] a4. ~ a4 |
+
+  \time 4/4
+  % f to d riff
+  \repeat volta 2 { r1 | r1 | r1 } \alternative { { r1 } { r1 } }
+  r1 |
+
+  % chorus
+  \time 11/8
+  \chorusVocalMelody
 
   <a c>2 r2 |
 
+  \repeat unfold 7 r1
+  % d minor thing
+  \repeat unfold 6 r1
+  \key d \minor
+  % more tapping!
+  \repeat unfold 8 r1
+  % droning in D
+  \repeat unfold 8 r1
 
+  % verse 3
+  d4.^"verse 3" e8 ~ e4 | f4 e d | c4. d8 ~ d4 | b2 r4 |
+  a4. c8 ~ c4 | d4. bf!8 ~ bf4 | c4. d8 ~ d4 ~ | d2 r4 |
+  d4. e8 ~ e4 | f4 e d | c4. d8 ~ d4 | b2 r8 g |
+  a4. c8 ~ c4 | d4. f8 ~ f4 | e2.( | d2) r4 |
+
+  bf8^"bridge" bf bf16 a8 bf16 ~ bf4 bf8 c |
+  d c c16 bf8 c16 ~ c4 r4 |
+  bf8 bf bf16 a8 bf16 ~ bf4 bf8 c |
+  d c c16 bf8 c16 ~ c4 r4 |
+  df8 df df16 c8 df16 ~ df8 df df ef |
+  f ef ef16 df8 ef16 ~ ef4 r8 ef |
+  f f f16 e!8 f16 ~ f4 f8 g |
+  a g g16( f8) g16 ~ g4 r4 |
+
+  r8 cs, cs d e8. d16 ~ d8 a ~ |
+  a2 r8 g g a |
+  bf2 r8 bf bf c |
+  d4 c r4 c |
+
+  % interlude
+  d2 r2 | r1 | r1 | r1 |
+  % pedal riff
+  \repeat unfold 8 r1 |
+  \time 11/8
+  \repeat unfold 2 { r1 r4. | }
+
+  \key a \minor
+  % pre-chorus
+  c4.^"pre-chorus" d8[ e] c8.[ d] e8. c |
+  d8.[ d] c[ c] b4. r4 |
+  c8.[ d] e8[ d] c8.[ d] e[ d] |
+  c[ a] b[ g] a4. ~ a4 |
+
+  \time 4/4
+  % f to d riff
+  \repeat unfold 4 r1 |
+  r1 |
+
+  \chorusVocalMelody
+  <a c>2 r2 | r1 | r1 |
+  \time 11/8 r1 r4. |
+
+  a8.[ b] c[ a] b[ c] d4 |
+  b8.[ c] d[ b] c[ d] e4 |
+  cs8.[ d] e[ cs] d[ e] f4 |
+  \time 4/4 e2 d2 |
+
+  \time 11/8
+  a8.[ b] c[ a] b[ c] d4 |
+  b8.[ c] d[ b] c[ d] e4 |
+  cs8.[ d] e[ cs] d[ e] f4 |
+  \time 4/4 <c! e>2 <b d>2 |
+  <a c>2 r2 |
+
+}
+
+chorusVocals = \lyricmode {
+  All those tears you heard me cry.
+  All those times I tried to fly.
+  You could not stand for fear to try.
+  Lost in %time.
+
+  All those fears you could de -- ny.
+  All the love that passed on by.
+  Striv -- ing for the per -- fect lie.
+  Lost in time.
 }
 
 vocals = \lyricmode {
@@ -285,16 +478,41 @@ vocals = \lyricmode {
   no -- thing left to say. __
 
   % chorus
-  All those tears you heard me cry.
-  All those times I tried to fly.
-  You could not stand for fear to try.
-  Lost in %time.
+  \chorusVocals
 
-  All those fears you could de -- ny.
-  All the love that passed on by.
-  Liv -- ing out this con -- stant lie.
-  Lost in time.
+  % verse 3
+  Los -- ing __ your sense of per -- cep -- tion
+  wond -- 'ring __ where it __ went wrong. __
+  Star -- ing back at your re -- flect -- tion,
+  it's string -- ing __ you a -- long. __
 
+  % bridge
+  Cling -- ing to the ash __ of a flame that once burned bright. __
+  Wag -- ing your own war __ for a litt -- le peace of mind. __
+  Stepp -- ing t'ward the door -- way that's been swing -- ing o -- pen wide.
+  And for one ti -- ny __ mo -- ment it fin -- 'lly felt __ right.
+
+  And as it flick -- ers out __
+  your on -- ly hope is one more mo -- ment in time.
+
+  % pre-chorus
+  Sitt -- ing so si -- lent -- ly
+  there's no -- thing left to say.
+  Act -- ing like there's no way out
+  for all e -- ter -- ni -- ty.
+
+  % chorus
+  \chorusVocals
+
+  Al -- ways won -- d'ring if you're done.
+  Life for you has just be -- gun.
+  Fight the war that's ne -- ver won.
+  Lost in %time
+
+  Vow -- ing that you'd ne -- ver run.
+  Look -- ing past the ones who shun.
+  Now you know your work's not done.
+  Lost in time
 }
 
 vox = \new Staff { \new Voice = "vocalMelody" \clef treble \globalConfig \vocalMelody }
@@ -310,6 +528,10 @@ chordExceptions = #(append
   ignatzekExceptions
 )
 
+tappingRiffChords = \chordmode {
+  a1:sus4 | d:m9/a | g:/a | d:/a |
+}
+
 pedalRiffChords = \chordmode {
   a2:sus4 a:m |
   a:sus4 d:/a |
@@ -323,18 +545,11 @@ verseOneChords = \chordmode {
   f:1.3.5.7+.11+/a |
   a:9 |
   c2:/g g |
-  \time 3/4 f2.:sus2 |
-  \time 5/8 g2:sus4 g8 |
+  \time 11/8 f2.:sus2 g2:sus4 g8 |
 }
 
-fToGRiffChords = \chordmode {
-  \repeat volta 2 {
-    f1 | g | bf2 c |
-  }
-  \alternative {
-    { d2.:m g4 }
-    { bf1 }
-  }
+fToDRiffChords = \chordmode {
+  f1 | g | bf2 c |
 }
 
 chorusChords = \chordmode {
@@ -347,13 +562,20 @@ chorusChords = \chordmode {
   }
 }
 
+preChorusChords = \chordmode {
+  a2:m ~ q8 c2.:maj7 |
+  d2.:sus4 g2 ~ g8 |
+  a2:m ~ q8 a4.:m/c a4.:/cs |
+  f2.:1.3.5.7+.11+ d4.:sus4/g d4 |
+}
+
 chordValues = \chordmode  {
   \set additionalPitchPrefix = #"add"
   \set majorSevenSymbol = \markup { "maj7" }
   \set chordNameExceptions = #chordExceptions
 
-  \repeat unfold 3 { a1:sus4 | d:m9/a | g:/a | d:/a | }
-  a:m11 |
+  \repeat unfold 3 \tappingRiffChords
+  a1:m11 |
 
   \repeat volta 2 \pedalRiffChords
 
@@ -367,24 +589,70 @@ chordValues = \chordmode  {
   a1:m7 | q4 ~ q8. d16:m9/a ~ q4 ~ q16 a8.:7/g |
   a1:m7 | q2. ~ q16 g8. |
   a1:m7 | q4 ~ q8. d16:m9/a ~ q4 ~ q16 c8.:/e |
-  \time 3/4 \powerChords f2.:1.5 |
-  \time 5/8 g2 ~ g8 |
+  \time 11/8 \powerChords f2.:1.5 g2 ~ g8 |
 
   % pre-chorus
-  \time 11/8
-  a2:m ~ q8 c2.:maj7 |
-  d2.:sus4 g2 ~ g8 |
-  a2:m ~ q8 a4.:m/c a4.:/cs |
-  f2.:1.3.5.7-.11+ d4.:sus4/g d4 |
-
-  \fToGRiffChords
+  \preChorusChords
 
+  \repeat volta 2 \fToDRiffChords
+  \alternative {
+    { d2.:m g4 }
+    { bf1 }
+  }
   e2:sus4 e:7/d |
 
   % chorus
   \chorusChords
 
+  % post-chorus
+  a1:m | c2:maj7 c | d1:sus4 | d |
+  a1:m | c2:maj7 c | d1:m | a:/cs |
 
+  d1:m ~ | q2 bf4 c | d1:m | q |
+  a | g2:m f4 c:/e |
+
+  \repeat unfold 4 { \transpose a d \tappingRiffChords }
+
+  % verse 3
+  \time 3/4
+  \repeat unfold 4 { d2.:m | g:m7/d | c:/d | g:/d | }
+
+  % bridge
+  \time 4/4
+  bf2. ~ bf8. c16 ~ | c2. ~ c8. bf16 ~ |
+  bf2. ~ bf8. c16 ~ | c2. ~ c8. df16 ~ |
+  df2. ~ df8. ef16 ~ | ef2. ~ ef8. f16 ~ |
+  f2. ~ f8. g16 ~ | g2. ~ g8. a16 ~ |
+
+  a1 | d2:m g | bf1 | c |
+
+  % interlude
+  d:m | r1 | r1 | r1 |
+
+  \transpose a d \pedalRiffChords
+
+  \time 11/8
+  \repeat unfold 2 { f2. g2 ~ g8 | }
+
+  % pre-chorus
+  \preChorusChords
+  \time 4/4
+  \fToDRiffChords
+  bf1 | e2:sus4 e:7/d |
+
+  % chorus
+  \chorusChords
+  a1:m | f | c | \time 11/8 r1 r4. |
+  \chorusChords
+
+  \pedalRiffChords
+  \time 11/8
+  f2. g2 ~ g8 |
+  f2.:sus2 g2:sus4 ~ g8 |
+
+  \time 4/4
+  \repeat unfold 2 \tappingRiffChords
+  a1:m11 |
 }
 
 \score {
@@ -431,4 +699,4 @@ chordValues = \chordmode  {
   }
   \midi {}
 }
-%}
\ No newline at end of file
+%}
diff --git a/lost-in-time.pdf b/lost-in-time.pdf
index 0a88adb..46a04bb 100644
Binary files a/lost-in-time.pdf and b/lost-in-time.pdf differ