diff --git a/awake.ly b/awake.ly
index abc9079..a3b962e 100644
--- a/awake.ly
+++ b/awake.ly
@@ -4,14 +4,14 @@
 \header {
   title = "Awake"
   composer = "Tommy Montgomery"
-  copyright = "(c) 2016 Tommy Montgomery"
+  copyright = "(c) 2017 Tommy Montgomery"
 }
 
 globalConfig = {
   \key b \mixolydian
   \time 4/4
   \numericTimeSignature
-  \tempo 4 = 132
+  \tempo 4 = 96
   \omit Voice.StringNumber
   \override TupletBracket #'bracket-visibility = #'if-no-beam
 }
@@ -86,7 +86,16 @@ fSharpPentDescRiff = \relative c'' {
   \repeat unfold 2 { a''16( fs) e cs c a fs e c b a e fs4 | }
 }
 
-guitarTwo = \relative c {
+guitarTwo = \relative c, {
+  \clef bass
+  <b b'>1^"keyboards" ~ | q ~ |
+  q ~ | q ~ | q ~ | q ~ |
+  q ~ | q | <a a'> ~ | q |
+  <g g'>2 <a a'> | <b b'>1 ~ | q \bar "||" |
+
+  \tempo 4 = 132
+  \clef "G_8"
+
   \repeat unfold 2 \mainFifthRiff
   \introRhythmGOne
   \repeat unfold 2 \mainFifthRiff
@@ -104,16 +113,21 @@ guitarTwo = \relative c {
   \repeat unfold 8 r1
 
   % verse 2
-  \repeat unfold 2 \bsusSingleNoteRiff
+  \repeat unfold 2 { <b' e>8( fs'4) <b, fs'>8 r2 | }
+  <a fs'>8( e'4) <a, e'>8 r2 | <a fs'>8( e'4) <a, e'>8 r8 e'16 a cs8 a |
+  \repeat unfold 2 { <b, e>8( fs'4) <b, fs'>8 r4 r8 b16 b | }
+  <a fs'>8( e'4) <a, e'>8 r4 r8 a16 a | <a fs'>8( e'4) <a, e'>8 r8 e'16 a cs8 a |
+
+  \bsusSingleNoteRiff
 
   % interlude 2
-  \repeat unfold 2 {
-    e,8 b' e\glissando( fs) g, d' g\glissando( a) |
-    \repeat unfold 2 { a, e' a\glissando( b) }  |
-  }
+  e,8 b' e\glissando( fs) g, d' g\glissando( a) |
+  \repeat unfold 2 { a, e' a\glissando( b) }  |
+  e,,8 b' e\glissando( fs) g, d' g\glissando( a) |
+  a, e' a\glissando( b) b, fs' b\glissando( cs) |
 
-  % f#m interlude
-  fs8^"Pre-chorus" cs' fs gs a gs a fs |
+  % pre-chorus (long)
+  fs,8^"Pre-chorus" cs' fs gs a gs a fs |
   fs, cs' fs gs a gs a fs |
   \repeat unfold 2 { gs, ds' gs as cs as bs gs | }
   \repeat unfold 2 { fs,8 cs' fs gs a gs a fs | }
@@ -137,6 +151,7 @@ guitarTwo = \relative c {
 
   \firstInterlude
 
+  % verse 3
   \repeat unfold 2 {
     b,,8 b16 b b( a) b8 r8 b16( a) b( a8.) |
     e'8 e16 e e( ds) b8 r8 b16( a) b8 r8 |
@@ -171,21 +186,21 @@ guitarTwo = \relative c {
   % instrumental interlude
 
   \repeat volta 2 {
-    \repeat unfold 2 { b8 b16 b b8 <b fs' b> b16 b b b ds'( e ds) b | }
-    d,8 d16 d d8 <d a' d> d16 d d d fs'( g fs) d |
-    d,8 d16 d d8 <d a' d> d16 d d d fs'( e) d( cs) |
-    \repeat unfold 2 { b,8 b16 b b8 <b fs' b> b16 b b b ds'( e ds) b | }
-    a,8 a16 a a8 <a e' a> a16 a a a cs'( d cs) a |
+    \repeat unfold 2 { b8 b16 b b8 <b fs' b> b16 b b b r4 | }
+    d8 d16 d d8 <d a' d> d16 d d d r4 |
+    d8 d16 d d8 <d a' d> d16 d d d r4 |
+    \repeat unfold 2 { b8 b16 b b8 <b fs' b> b16 b b b r4 | }
+    a8 a16 a a8 <a e' a> a16 a a a r4 |
   }
   \alternative {
-    { a,8 a16 a a8 <a e' a> a16 a a a \times 4/6 { e''( d cs) b( a gs) } | }
-    { <g, d' g>4 q8 g16 g <g d' g>8\glissando( <a e' a>) q4 | }
+    { a8 a16 a a8 <a e' a> a16 a a a r4 | }
+    { <g d' g>4 q8 g16 g <g d' g>8\glissando( <a e' a>) q4 | }
   }
 
   \repeat volta 2 {
     b16^"keyboard" ds e ds fs e ds e( ds) b e( ds) e( ds) b( a) |
     b ds e ds fs e ds e( ds) b e( ds) e( ds) b a |
-    g d' a' d, a' d, g, d' g, d' a' d, a' d, g, d' |
+    g d' a' g d' a' g d' a' d, g, a d, g, a d, |
   }
   \alternative {
     { g, d' a' d, a' d, g, d' g, d' a' d, <a e' b'>4 | }
@@ -213,15 +228,26 @@ guitarTwo = \relative c {
     a16 b d e fs a b d e\glissando( fs\glissando e d) b a fs e |
   }
 
+  b8 r b16 c b a b8 r b16 c b a |
+  b8 g' b, fs' b, r b16 c b a |
+  b8 r b16 c b a b8 e b ds |
+  b8 r b16 c b a b8 r b16 c b a |
+  b8 b' b, a' b, r b16 c b a |
+  b8 r b16 c b a b8 c' b, a' |
+  b, fs' b, ds b c b a |
+  b r b16 c b a b c ds e fs e ds c |
+
   b16 c ds e fs e ds e fs g a b c b a c |
   b c ds e fs e ds e fs g a b c b a c |
-  b fs g e fs ds e c ds b c a b fs g e |
-  fs ds e c ds b c a <b e>8 <a d> <g c> <fs b> |
+  b fs^"keyboard" g e fs ds e c ds b c a b fs g e |
+  fs ds e c ds b c a <b e>8^"guitars" <a d> <g c> <fs b> |
 
   % guitar solo lead in
   r1 |
 
   % guitar solo
+  \key e \dorian
+
   \repeat unfold 2 {
     \repeat unfold 3 { <e b'>4. e16 e g( e) e d'( a) a cs( a) | }
     <e b'>4. e16 e <bf' f'>8. <g d'>16 ~ q8 <a e'> |
@@ -290,9 +316,18 @@ guitarTwo = \relative c {
   \firstInterlude \bar "|."
 }
 
-guitarOne = \relative c'' {
+guitarOne = \relative c' {
+  % keyboard intro
+  r1 | r1 |
+  b2^"keyboards" ~ b8 a4 gs8 ~ | gs fs4 e8 ~ e4. ds8 | e4 ds8 e ~ e ds4 b8 ~ | b2. r4 |
+  fs'2 ~ fs8 e4 ds8 ~ | ds e4 fs8 ~ fs2 | e2. ds4 | cs1 |
+  b1 ~ | b1 ~ | b1 \bar "||" |
+
+  \tempo 4 = 132
+  \clef "G_8"
+
   <<
-    { b1 ~ | b1 ~ | b4. a8  ~ a4  g | fs4. g16( fs) e2 ~ | } \\
+    { b''1^"guitars" ~ | b1 ~ | b4. a8  ~ a4  g | fs4. g16( fs) e2 ~ | } \\
     { fs1  | a    | g4. fs8 ~ fs4 e | d4.  e16( d ) cs2  | }
   >>
   <<
@@ -356,16 +391,116 @@ guitarOne = \relative c'' {
   % interlude 2
   \repeat unfold 4 r1
 
-  % pre-chorus or whatever
-  % \repeat unfold 8 r1
-
   % interlude 3
   \repeat unfold 15 r1
   \time 5/4 r1 r4
   \time 4/4
 
   % chorus
+  \repeat unfold 20 r1
+
+  % post chorus riffage, f#7 run -> c
+  \repeat unfold 9 r1
+
+  % bsus4 interlude with chorused guitar
+  \repeat unfold 8 r1
+
+  % verse 2
   \repeat unfold 16 r1
+
+  % post verse descending f#m run
+  \repeat unfold 4 r1
+
+  % pre-chorus
+  \repeat unfold 6 r1
+
+  <cs,, cs'>4 <ds ds'>4 ~ q8 <es es'>4. |
+  <fs fs'>4. <ds ds'>8 ~ q <es es'>4 <fs fs'>8 ~ |
+  q <es es'>4. <fs fs'>4. <gs gs'>8 ~ |
+  q4 <es es'> <fs fs'> <gs gs'> |
+
+  <fs fs'>4. <gs gs'>8 ~ <gs gs'>4 <a a'> ~ |
+  q8 <fs fs'>4 <gs gs'>8 ~ q <a a'>4 <cs, gs' cs>8 |
+  q r <cs gs' cs> q r <d gs d'> q r |
+  <d g d'> q r <cs gs' cs> q r r4 |
+
+  % chorus
+  \repeat unfold 20 r1
+
+  % musical interlude/solo
+
+  \repeat volta 2 {
+    <<
+      { \repeat unfold 2 { r2 r4 b''16( cs b) fs | } } \\
+      { \repeat unfold 2 { r2 r4 ds16( e ds) b | } }
+    >>
+    <<
+      { r2 r4 d'16( e d) a | r2 r4 d16( cs) b a | } \\
+      { r2 r4 fs,16( g fs) d | r2 r4 fs'16( e) d cs | }
+    >>
+    <<
+      { \repeat unfold 2 { r2 r4 b'16( cs b) fs | } } \\
+      { \repeat unfold 2 { r2 r4 ds16( e ds) b | } }
+    >>
+  }
+  \alternative {
+    {
+      <<
+        { r2 r4 a'16( b cs b) | r2 r4 \times 4/6 { fs'16( e d) cs16( b a) } | } \\
+        { r2 r4 cs,16( d e d) | r2 r4 \times 4/6 { a'16( gs fs) e16( d cs) } | }
+      >>
+    }
+    {
+      <<
+        { b'8 } \\
+        { b,8 }
+      >>
+      r8 \times 4/6 { g16( a b) cs( d e) } \times 4/6 { fs( g a) b( cs b) } \times 4/6 { a( g fs) e( d cs) } |
+    }
+  }
+
+  \repeat volta 2 {
+    \repeat unfold 2 { <b, fs' b>4 q8. q16 ~ q8 q8 q4 | }
+    g16 g g g <g d' a'>4 q g16 g g g |
+  }
+  \alternative {
+    { <g d' a'>4 q g16 g g g <a e' b'>4 | }
+    { e16 e e e g g g g a a a a c4 | }
+  }
+
+  \repeat volta 2 { r1 | r1 | r1 |  } \alternative { { r1 } { r1 } }
+
+  \repeat volta 2 { \repeat unfold 8 r1 }
+  \repeat unfold 8 r1
+  \repeat unfold 4 r1
+
+  % solo
+  \tuplet 3/2 4 { e8(^"guitar solo" g) b  e( g) bf e bf b e b fs' } |
+
+  \key e \dorian
+
+  g2 ~ \tuplet 3/2 { g4 fs \tuplet 3/2 { e8( fs e) } } |
+  a,2 fs,16 a b cs e g fs e |
+  fs2 b,16 cs e fs a cs b a |
+  b2 e,16 fs a b d fs e d |
+
+  \ottava #1 e2 e16( d) b bf b d f( d) |
+  b bf b d fs!( d) b bf b d fs g a( bf a g) |
+  a( g) e d b bf b d b bf g e \ottava #0 g e b a |
+  g16 a fs g \tuplet 6/4 4 { e16 fs g a b c b c d e fs g fs g a b c b } |
+
+  as2 \times 4/6 { fs16 as cs e( cs) as } fs32 as cs fs as( fs) cs as |
+  \tuplet 6/4 4 { as,16( d) fs as d fs as( fs) d as fs d } as4. as16( b) |
+  fs'4. b,16( as) fs8 g e4 |
+  fs16 g as b cs d e fs g as b cs e fs g fs |
+
+  e4. bf16( b) e,4. bf16( b) |
+  e,4. <fs' fs>8 ~ q fs8 a16( fs) e d |
+  b a b d e( d) b a fs e fs a b4 |
+  \tuplet 6/4 4 { b16 b b fs' fs fs e e e b' b b  \ottava #1 a a a e' e e d d d a' a a } |
+
+  \key b \mixolydian
+  b4 \ottava #0 r4 r2 |
 }
 
 chorusVocalMelody = \relative c'' {
@@ -385,43 +520,46 @@ chorusVocalMelody = \relative c'' {
   \repeat unfold 2 r1 |
 }
 
-vocalMelody = \relative c'' {
+vocalMelody = \relative c' {
   \globalConfig
   \dynamicUp
 
+  % keyboard intro
+  \repeat unfold 13 r1
+
+  \bar "||"
+
+  \tempo 4 = 132
+
   \repeat unfold 38 r1
 
   % verse 1
-  r4^"Verse 1" ds8 e ~ e2( | ds4) r4 r2 |
-  r4 ds8 e ~ e2( | fs2) r2 |
-  r4 r8 ds ~ ds ds e e ~ |
-  e4.( fs8 ~ fs) e ds cs ~ |
-  cs2 r2 |
-  r1 |
+  r4^"Verse 1" ds8 e( ~ e4 ds ~ | ds2) r2 |
+  r4 ds8 e( ~ e4. fs8 ~ | fs2) r2 |
+  r4 ds ds ds8 e ~ | e4. fs8 ~ fs e ds cs ~ |
+  cs1 | r1 |
 
-  r4 ds8 e ~ e2( | ds4) r4 r2 |
-  r4 ds8 e ~ e2( | fs2) r2 |
-  r2 r8 ds ds e ~ |
-  e4.( fs8 ~ fs) e ds cs ~ |
-  cs4.( ds16 cs b4) r4 |
-  r1 |
+  r4 ds8 e( ~ e4 ds ~ | ds2) r2 |
+  r4 ds8 e( ~ e4. fs8 ~ | fs2) r2 |
+  r4 ds ds4. e8( ~ | e4. fs8 ~ fs) e ds cs( ~ |
+  cs4. ds16 cs b2) | r1 |
 
   % interlude 1
   r1^"Interlude" | \repeat unfold 7 r1 |
 
   % verse 2
-  r4^"Verse 2" ds8 e ~ e2( | ds4) r4 r2 |
-  r4 ds8 e ~ e2( | fs2) r2 |
-  r4 ds ds8 ds4 e8 ~ |
-  e4.( fs8 ~ fs) e ds cs ~ |
-  cs2 r2 |
-  r1 |
+  r4^"Verse 2" ds'8 e( ~ e4 ds ~ | ds2) r2 |
+  r4 ds8 e( ~ e4. fs8 ~ | fs2) r2 |
+  r4 ds ds8 ds4 e8( ~ | e4. fs8 ~ fs) e ds cs ~ |
+  cs1 | r1 |
 
-  r4 ds8 e ~ e2( | ds4) r4 r2 |
-  r4 ds8 e ~ e2( | fs2) r2 |
-  r4 ds ds ds8 e ~ |
-  e4.( fs8 ~ fs) e ds cs ~ |
-  cs2( ds | e fs | e4) r4 r2 |
+  r4 ds8 e( ~ e4 ds4 ~ | ds2) r2 |
+  r4 ds8 e( ~ e4. fs8 ~ | fs2) r2 |
+  r4 ds ds ds8 e( ~ |
+  e4. fs8 ~ fs) e ds cs( ~ |
+  cs2 ds | e fs |
+
+  e4) r4 r2 |
 
   % interlude 2
   \repeat unfold 3 r1
@@ -465,6 +603,7 @@ vocalMelody = \relative c'' {
   \repeat volta 2 { \repeat unfold 3 r1 } \alternative { { r1 } { r1 } }
   \repeat volta 2 { \repeat unfold 3 r1 } \alternative { { r1 } { r1 } }
   \repeat volta 2 { \repeat unfold 8 r1 }
+  \repeat unfold 8 r1
   \repeat unfold 4 r1
 
   % lead-in to guitar solo
@@ -526,15 +665,27 @@ vocalMelody = \relative c'' {
   \repeat unfold 3 r1 |
 }
 
+chorusVocals = \lyricmode {
+  Eyes o __ -- pen wide, __
+  try -- ing to see __ the truth.
+  I don't __ know why __
+  I ne -- ver __ see you.
+
+  Sun in __ my eyes, __
+  wash -- es a -- way __ the pain. __
+  A -- wake __ to -- day, __
+  to -- mor -- row __ the dark -- ness __ will fade back __ to light. __
+}
+
 vocals = \lyricmode {
   % verse 1
   A -- wake, __
   a -- rise, __
-  let the sun o __ -- pen your eyes. __
+  and let the sun __ o -- pen your eyes. __
 
   A -- lign __
   your mind. __
-  You __ were ne __ -- ver that blind. __
+  You were ne __ -- ver that blind. __
 
   % verse 2
   To live, __
@@ -546,38 +697,20 @@ vocals = \lyricmode {
   don't let the mad -- __ ness be -- gin. __
 
   % chorus
-  Eyes op __ -- en wide, __
-  try -- ing to see the __ truth.
-  I don't __ know why __
-  I ne -- ver see you.
-
-  Sun in __ my eyes, __
-  Wash -- es a -- way the pain.
-  A -- wake __ to -- day __
-  To -- mor -- row the dark -- ness will fade back __ to light. __
+  \chorusVocals
 
   % verse 3
-  I've felt the won -- __ der as the pride __ left my __ eyes. __
-  I've seen the ro -- __ ses as they reach __ for the __ skies. __
-  Death and de -- cay, __ our mor __ -- tal __ shame __
-  'til our soul leaves the earth. __
-  Fu -- tile __ plan __ from an ig -- no -- rant man, __
-  we all de -- serve __ to burn. __
+  I've felt the won -- __ der as the pride __ left __ my __ eyes. __
+  I've seen the rose -- __ es __ as they reach __ for __ the __ skies. __
+  Death and de -- cay, __ our mor __ -- tal __ shame __ 'til our soul leaves __ the earth. __
+  Fu -- tile __ plan __ from an ig -- no -- rant man, __  we all de -- serve __ to burn. __
 
   % pre-chorus
-  Ro -- ses __ are red with __ the blood of __ the dead.
+  Rose -- es __ are red with __ the blood of __ the dead.
   See the light __ for the dark -- ness it will __ be -- come. __
 
   % chorus
-  Eyes op __ -- en wide, __
-  try -- ing to see the __ truth.
-  I don't __ know why __
-  I ne -- ver see you.
-
-  Sun in __ my eyes, __
-  Wash -- es a -- way the pain.
-  A -- wake __ to -- day __
-  To -- mor -- row the dark -- ness will fade back __ to light. __
+  \chorusVocals
 
   % bridge
   <<
@@ -600,16 +733,8 @@ vocals = \lyricmode {
   Light will __ shine on ev -- en af -- ter __ we're gone. __
   The beau -- ty of life __ re -- minds us that death is not to fear.
 
-  % chorus again
-  Eyes op -- en wide, __
-  try -- ing to see the truth. __
-  I don't __ know why __
-  I ne -- ver see you.
-
-  Sun in __ my eyes, __
-  Wash -- es a -- way the pain.
-  A -- wake __ to -- day, __
-  to -- mor -- row the dark -- ness will fade back __ to light. __
+  % chorus
+  \chorusVocals
 
   % outro
   % A -- wake, __ a -- rise. __
@@ -625,7 +750,6 @@ vocals = \lyricmode {
   Ah. __
 }
 
-
 vox = \new Staff \with {
   instrumentName = "Vocals"
   midiInstrument = #"voice oohs"
@@ -730,6 +854,7 @@ chordValues = {
       \override Glissando.minimum-length = #4
       \override Glissando.springs-and-rods = #ly:spanner::set-spacing-rods
       \override Glissando.thickness = #2
+      \override VerticalAxisGroup.remove-first = ##t
     }
   }
   \midi {}
diff --git a/awake.pdf b/awake.pdf
index be31092..b86940f 100644
Binary files a/awake.pdf and b/awake.pdf differ