diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/His Father's Lament for Donald MacKenzie.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/His Father's Lament for Donald MacKenzie.ly
deleted file mode 100644
index e7086ec..0000000
--- a/piobaireachd/his_fathers_lament_for_donald_mackenzie/His Father's Lament for Donald MacKenzie.ly	
+++ /dev/null
@@ -1,172 +0,0 @@
-\include "bagpipe.ly"
-melody = {
-		\set Staff.midiInstrument = #"bagpipe"
-		\hideKeySignature
-		\cadenzaOn
-		\once \override Score.BreakAlignment #'break-align-orders =
-			#(make-vector 3 '(instrument-name
-									left-edge
-									ambitus
-									span-bar
-									breathing-sign
-									clef
-									key-signature
-									time-signature
-									staff-bar
-									custos
-									span-bar))
-		\time 4/4
-		\bar "|:" \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg f8. [ e16 ] \grg c8 [ e8 ] \grd b4 a4 \bar ":|" \break
- \bar "|." \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg f8. [ e16 ] \grg c8 [ e8 ] \grd b4 a4 \bar ".|" \break 
- \bar "|." \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg f8. [ e16 ] \grg c8. [ f16 ] \grg e8. [ c16 ] \grg b8 [ e8 ] \bar "|"
- \grg f8. [ e16 ] \grg c8 [ e8 ] \grd b4 a4 \bar ":|:" \break
-
- \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- A4 c8 [ e8 ] \grd b4 a4 \bar ":|" \break
- \bar "|." A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- A4 c8 [ e8 ] \grd b4 a4 \bar ".|" \break 
- \bar "|." A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- A4 c8. [ f16 ] \grg e4 c8. [ A16 ] \bar "|"
- e4 c8 [ e8 ] \grd b4 a4 \bar ":|:" \break
-
- \set Score.repeatCommands = #'((volta "1"))  \grd \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \set Score.repeatCommands = #'((volta "2"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
- c8. [ \gre a32 ] \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- \grg c8. [ \gre a32 ] \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg c8. [ \gre a32 ] \grg b8. [ \gre a32 ] \bar ":|" \break
- \bar "|." \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg c8. [ \gre a32 ] \grg b8. [ \gre a32 ] \bar ".|" \break 
- \bar "|." \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- A8. [ a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] A8. [ a32 ] \bar "|"
- \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg c8. [ \gre a32 ] \grg b8. [ \gre a32 ] \bar ":|:" \break
-
- \grg c8. [ \gre c32 ] \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- \grg c8. [ \gre c32 ] \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg c8. [ \gre c32 ] \grg b8. [ \gre b32 ] \bar ":|" \break
- \bar "|." \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg c8. [ \gre c32 ] \grg b8. [ \gre b32 ] \bar ".|" \break 
- \bar "|." \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- A8. [ \grg A32 ] f8. [ \grg f32 ] \grg e8. [ \grf e16 ] A8. [ \grg A32 ] \bar "|"
- f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg c8. [ \gre c32 ] \grg b8. [ \gre b32 ] \bar ":|:" \break
-
- \grg a8. [ \grd c16 ] \grg a16 [ \grd c8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg a8. [ f16 ] \grg a16 [ f8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg a8. [ \grd c16 ] \grg a16 [ \grd c8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg a8. [ f16 ] \grg a16 [ e8. ] \grd b4 a4 \bar ":|:" \break
-
- \grg a8. [ f16 ] \grg a16 [ f8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg a8. [ \grd c16 ] \grg a16 [ \grd c8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg a8. [ f16 ] \grg a16 [ f8. ] \grg e32 [ \gra e8. ] \echoa e4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "2"))  \grg a8. [ A16 ] a16 [ f8. ] \grg a8. [ e16 ] \grg a16 [ A8. ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
- a8. [ f16 ] \grg a16 [ e8. ] \grd b4 a4 \bar ":|:" \break
-
- \grg a32 [ \grd c8. ] \grg a32 [ \grd c8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
- \grg a32 [ f8. ] \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
- \grg a32 [ \grd c8. ] \grg a32 [ \grd c8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
- \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ \grd c8. ] \grg a32 [ \grd b8. ] \bar ":|:" \break
-
- \grg a32 [ f8. ] \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
- \grg a32 [ \grd c8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg a32 [ f8. ] \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "2"))  \grg a32 [ A8. ] a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ A8. ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
- a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ \grd c8. ] \grg a32 [ \grd b8. ] \bar ":|:" \break
-
- \grd c4 \taor a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- f4 a8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c4 \taor a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- f4 a16 [ e8. ] \grd b4 a4 \bar ":|:" \break
-
- f4 a8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c4 \taor a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  f4 a8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "2"))  A4 a8. [ f16 ] e4 a8. [ A16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
- f4 \taor a16 [ e8. ] \grd b4 a4 \bar ":|:" \break
-
- c4 a8. [ \grd c16 ] e4 a8. [ e16 ] \bar "|"
- f4 a8. [ f16 ] e4 a8. [ e16 ] \bar "|"
- c4 a8. [ \grd c16 ] e4 a8. [ e16 ] \bar "|"
- f4 a8. [ e16 ] c4 a8. [ \grd b16 ] \bar ":|:" \break
-
- f4 a8. [ f16 ] e4 a8. [ e16 ] \bar "|"
- c4 a8. [ \grd c16 ] e4 a8. [ e16 ] \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  f4 a8. [ f16 ] e4 a8. [ e16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "2"))  A4 a8. [ f16 ] e4 a8. [ A16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
- f4 \taor a8. [ e16 ] c4 a8. [ \grd b16 ] \bar ":|:" \break
-
- ( \grd c4 ) e8 [ a8 ( \grd c8 ] ) \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- f4 a8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- ( \grd c4 ) e8 [ a8 ( \grd c8 ] ) \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- f4 a8 [ e8 ] \grd b4 a4 \bar ":|:" \break
-
- f4 a8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- ( \grd c4 ) e8 [ a8 ( \grd c8 ] ) \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  f4 a8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "2"))  A4 a8 [ f8 ] e4 a8 [ A8 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
- f4 e8 [ a8 e8 ] \grd b4 a4 \bar ":|:" \break
-
- c4 a8 [ \grd c16 ] e4 a8 [ e16 ] \bar "|"
- f4 a8 [ f16 ] e4 a8 [ e16 ] \bar "|"
- c4 a8 [ \grd c16 ] e4 a8 [ e16 ] \bar "|"
- f4 a8 [ e16 ] c4 a8 [ \grd b16 ] \bar ":|:" \break
-
- f4 a8 [ f16 ] e4 a8 [ e16 ] \bar "|"
- c4 a8 [ \grd c16 ] e4 a8 [ e16 ] \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  f4 a8 [ f16 ] e4 a8 [ e16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "2"))  A4 a8 [ f16 ] e4 a8 [ A16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
- f4 e8 [ a8 e16 ] c4 a8 [ \grd b16 ] \bar ":|" \break
-
-			}
-
-\score {
-	\melody
-	\layout {
-	indent = 0.0\cm
-	\context { \Score \remove "Bar_number_engraver" }
-	}
-	\header {
-	title = "His Father's Lament for Donald MacKenzie"
-	meter = "John Ban MacKenzie, 1863"
-	arranger = "I. GROUND"
-	}
-	
-}
-
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var10.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var10.ly
deleted file mode 100644
index cf7169f..0000000
--- a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var10.ly
+++ /dev/null
@@ -1,48 +0,0 @@
-\include "bagpipe.ly"
-melody = {
-		\set Staff.midiInstrument = #"bagpipe"
-		\hideKeySignature
-		\cadenzaOn
-		\once \override Score.BreakAlignment #'break-align-orders =
-			#(make-vector 3 '(instrument-name
-									left-edge
-									ambitus
-									span-bar
-									breathing-sign
-									clef
-									key-signature
-									time-signature
-									staff-bar
-									custos
-									span-bar))
-		\time 4/4
-		\bar "|:" c4 a8 [ \grd c16 ] e4 a8 [ e16 ] \bar "|"
- f4 a8 [ f16 ] e4 a8 [ e16 ] \bar "|"
- c4 a8 [ \grd c16 ] e4 a8 [ e16 ] \bar "|"
- f4 a8 [ e16 ] c4 a8 [ \grd b16 ] \bar ":|:" \break
-
- f4 a8 [ f16 ] e4 a8 [ e16 ] \bar "|"
- c4 a8 [ \grd c16 ] e4 a8 [ e16 ] \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  f4 a8 [ f16 ] e4 a8 [ e16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "2"))  A4 a8 [ f16 ] e4 a8 [ A16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
- f4 e8 [ a8 e16 ] c4 a8 [ \grd b16 ] \bar ":|" \break
-
-			}
-
-\score {
-	\melody
-	\layout {
-	indent = 0.0\cm
-	\context { \Score \remove "Bar_number_engraver" }
-	}
-	\header {
-	title = "His Father's Lament for Donald MacKenzie"
-	meter = "John Ban MacKenzie, 1863"
-	arranger = "X. CRUNLUATH DOUBLING"
-	}
-	
-}
-
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var2.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var2.ly
deleted file mode 100644
index 2a1d5f9..0000000
--- a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var2.ly
+++ /dev/null
@@ -1,47 +0,0 @@
-\include "bagpipe.ly"
-melody = {
-		\set Staff.midiInstrument = #"bagpipe"
-		\hideKeySignature
-		\cadenzaOn
-		\once \override Score.BreakAlignment #'break-align-orders =
-			#(make-vector 3 '(instrument-name
-									left-edge
-									ambitus
-									span-bar
-									breathing-sign
-									clef
-									key-signature
-									time-signature
-									staff-bar
-									custos
-									span-bar))
-		\time 4/4
-		\bar "|:" \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- A4 c8 [ e8 ] \grd b4 a4 \bar ":|" \break
- \bar "|." A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- A4 c8 [ e8 ] \grd b4 a4 \bar ".|" \break 
- \bar "|." A4 c8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- A4 c8. [ f16 ] \grg e4 c8. [ A16 ] \bar "|"
- e4 c8 [ e8 ] \grd b4 a4 \bar ".|" \break 
-
-			}
-
-\score {
-	\melody
-	\layout {
-	indent = 0.0\cm
-	\context { \Score \remove "Bar_number_engraver" }
-	}
-	\header {
-	title = "His Father's Lament for Donald MacKenzie"
-	meter = "John Ban MacKenzie, 1863"
-	arranger = "II. VAR. I"
-	}
-	
-}
-
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var3.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var3.ly
deleted file mode 100644
index 84a9bf3..0000000
--- a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var3.ly
+++ /dev/null
@@ -1,49 +0,0 @@
-\include "bagpipe.ly"
-melody = {
-		\set Staff.midiInstrument = #"bagpipe"
-		\hideKeySignature
-		\cadenzaOn
-		\once \override Score.BreakAlignment #'break-align-orders =
-			#(make-vector 3 '(instrument-name
-									left-edge
-									ambitus
-									span-bar
-									breathing-sign
-									clef
-									key-signature
-									time-signature
-									staff-bar
-									custos
-									span-bar))
-		\time 4/4
-		\bar "|:" \set Score.repeatCommands = #'((volta "1"))  \grd \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \set Score.repeatCommands = #'((volta "2"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
- c8. [ \gre a32 ] \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- \grg c8. [ \gre a32 ] \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg c8. [ \gre a32 ] \grg b8. [ \gre a32 ] \bar ":|" \break
- \bar "|." \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg c8. [ \gre a32 ] \grg b8. [ \gre a32 ] \bar ".|" \break 
- \bar "|." \grg f8. [ \grg a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- \grg c8. [ \gre a32 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \grg e8. [ \grf a16 ] \bar "|"
- A8. [ a32 ] \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] A8. [ a32 ] \bar "|"
- \grg f8. [ \grg a32 ] \grg e8. [ \grf a16 ] \grg c8. [ \gre a32 ] \grg b8. [ \gre a32 ] \bar ".|" \break 
-
-			}
-
-\score {
-	\melody
-	\layout {
-	indent = 0.0\cm
-	\context { \Score \remove "Bar_number_engraver" }
-	}
-	\header {
-	title = "His Father's Lament for Donald MacKenzie"
-	meter = "John Ban MacKenzie, 1863"
-	arranger = "III. VAR. II"
-	}
-	
-}
-
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var4.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var4.ly
deleted file mode 100644
index e1dc71c..0000000
--- a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var4.ly
+++ /dev/null
@@ -1,47 +0,0 @@
-\include "bagpipe.ly"
-melody = {
-		\set Staff.midiInstrument = #"bagpipe"
-		\hideKeySignature
-		\cadenzaOn
-		\once \override Score.BreakAlignment #'break-align-orders =
-			#(make-vector 3 '(instrument-name
-									left-edge
-									ambitus
-									span-bar
-									breathing-sign
-									clef
-									key-signature
-									time-signature
-									staff-bar
-									custos
-									span-bar))
-		\time 4/4
-		\bar "|:" \grg c8. [ \gre c32 ] \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- \grg c8. [ \gre c32 ] \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg c8. [ \gre c32 ] \grg b8. [ \gre b32 ] \bar ":|" \break
- \bar "|." \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg c8. [ \gre c32 ] \grg b8. [ \gre b32 ] \bar ".|" \break 
- \bar "|." \grg f8. [ \grg f32 ] \grg f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- \grg c8. [ \gre c32 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \grg e8. [ \grf e16 ] \bar "|"
- A8. [ \grg A32 ] f8. [ \grg f32 ] \grg e8. [ \grf e16 ] A8. [ \grg A32 ] \bar "|"
- f8. [ \grg f32 ] \grg e8. [ \grf e16 ] \grg c8. [ \gre c32 ] \grg b8. [ \gre b32 ] \bar ".|" \break 
-
-			}
-
-\score {
-	\melody
-	\layout {
-	indent = 0.0\cm
-	\context { \Score \remove "Bar_number_engraver" }
-	}
-	\header {
-	title = "His Father's Lament for Donald MacKenzie"
-	meter = "John Ban MacKenzie, 1863"
-	arranger = "IV. VAR. II DOUBLING"
-	}
-	
-}
-
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var5.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var5.ly
deleted file mode 100644
index 4f5bef6..0000000
--- a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var5.ly
+++ /dev/null
@@ -1,48 +0,0 @@
-\include "bagpipe.ly"
-melody = {
-		\set Staff.midiInstrument = #"bagpipe"
-		\hideKeySignature
-		\cadenzaOn
-		\once \override Score.BreakAlignment #'break-align-orders =
-			#(make-vector 3 '(instrument-name
-									left-edge
-									ambitus
-									span-bar
-									breathing-sign
-									clef
-									key-signature
-									time-signature
-									staff-bar
-									custos
-									span-bar))
-		\time 4/4
-		\bar "|:" \grg a8. [ \grd c16 ] \grg a16 [ \grd c8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg a8. [ f16 ] \grg a16 [ f8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg a8. [ \grd c16 ] \grg a16 [ \grd c8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg a8. [ f16 ] \grg a16 [ e8. ] \grd b4 a4 \bar ":|:" \break
-
- \grg a8. [ f16 ] \grg a16 [ f8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg a8. [ \grd c16 ] \grg a16 [ \grd c8. ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg a8. [ f16 ] \grg a16 [ f8. ] \grg e32 [ \gra e8. ] \echoa e4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "2"))  \grg a8. [ A16 ] a16 [ f8. ] \grg a8. [ e16 ] \grg a16 [ A8. ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
- a8. [ f16 ] \grg a16 [ e8. ] \grd b4 a4 \bar ":|" \break
-
-			}
-
-\score {
-	\melody
-	\layout {
-	indent = 0.0\cm
-	\context { \Score \remove "Bar_number_engraver" }
-	}
-	\header {
-	title = "His Father's Lament for Donald MacKenzie"
-	meter = "John Ban MacKenzie, 1863"
-	arranger = "V. VAR. III"
-	}
-	
-}
-
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var6.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var6.ly
deleted file mode 100644
index 38748f7..0000000
--- a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var6.ly
+++ /dev/null
@@ -1,48 +0,0 @@
-\include "bagpipe.ly"
-melody = {
-		\set Staff.midiInstrument = #"bagpipe"
-		\hideKeySignature
-		\cadenzaOn
-		\once \override Score.BreakAlignment #'break-align-orders =
-			#(make-vector 3 '(instrument-name
-									left-edge
-									ambitus
-									span-bar
-									breathing-sign
-									clef
-									key-signature
-									time-signature
-									staff-bar
-									custos
-									span-bar))
-		\time 4/4
-		\bar "|:" \grg a32 [ \grd c8. ] \grg a32 [ \grd c8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
- \grg a32 [ f8. ] \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
- \grg a32 [ \grd c8. ] \grg a32 [ \grd c8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
- \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ \grd c8. ] \grg a32 [ \grd b8. ] \bar ":|:" \break
-
- \grg a32 [ f8. ] \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
- \grg a32 [ \grd c8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg a32 [ f8. ] \grg a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ e8. ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "2"))  \grg a32 [ A8. ] a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ A8. ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
- a32 [ f8. ] \grg a32 [ e8. ] \grg a32 [ \grd c8. ] \grg a32 [ \grd b8. ] \bar ":|" \break
-
-			}
-
-\score {
-	\melody
-	\layout {
-	indent = 0.0\cm
-	\context { \Score \remove "Bar_number_engraver" }
-	}
-	\header {
-	title = "His Father's Lament for Donald MacKenzie"
-	meter = "John Ban MacKenzie, 1863"
-	arranger = "VI. VAR. III. DOUBLING"
-	}
-	
-}
-
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var7.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var7.ly
deleted file mode 100644
index 49d6ea6..0000000
--- a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var7.ly
+++ /dev/null
@@ -1,48 +0,0 @@
-\include "bagpipe.ly"
-melody = {
-		\set Staff.midiInstrument = #"bagpipe"
-		\hideKeySignature
-		\cadenzaOn
-		\once \override Score.BreakAlignment #'break-align-orders =
-			#(make-vector 3 '(instrument-name
-									left-edge
-									ambitus
-									span-bar
-									breathing-sign
-									clef
-									key-signature
-									time-signature
-									staff-bar
-									custos
-									span-bar))
-		\time 4/4
-		\bar "|:" \grd c4 \taor a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- f4 a8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c4 \taor a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- f4 a16 [ e8. ] \grd b4 a4 \bar ":|:" \break
-
- f4 a8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c4 \taor a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  f4 a8. [ f16 ] \grg e32 [ \gra e8. ] \echoa e4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "2"))  A4 a8. [ f16 ] e4 a8. [ A16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
- f4 \taor a16 [ e8. ] \grd b4 a4 \bar ":|" \break
-
-			}
-
-\score {
-	\melody
-	\layout {
-	indent = 0.0\cm
-	\context { \Score \remove "Bar_number_engraver" }
-	}
-	\header {
-	title = "His Father's Lament for Donald MacKenzie"
-	meter = "John Ban MacKenzie, 1863"
-	arranger = "VII. TAORLUATH"
-	}
-	
-}
-
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var8.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var8.ly
deleted file mode 100644
index 0c8b44b..0000000
--- a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var8.ly
+++ /dev/null
@@ -1,48 +0,0 @@
-\include "bagpipe.ly"
-melody = {
-		\set Staff.midiInstrument = #"bagpipe"
-		\hideKeySignature
-		\cadenzaOn
-		\once \override Score.BreakAlignment #'break-align-orders =
-			#(make-vector 3 '(instrument-name
-									left-edge
-									ambitus
-									span-bar
-									breathing-sign
-									clef
-									key-signature
-									time-signature
-									staff-bar
-									custos
-									span-bar))
-		\time 4/4
-		\bar "|:" c4 a8. [ \grd c16 ] e4 a8. [ e16 ] \bar "|"
- f4 a8. [ f16 ] e4 a8. [ e16 ] \bar "|"
- c4 a8. [ \grd c16 ] e4 a8. [ e16 ] \bar "|"
- f4 a8. [ e16 ] c4 a8. [ \grd b16 ] \bar ":|:" \break
-
- f4 a8. [ f16 ] e4 a8. [ e16 ] \bar "|"
- c4 a8. [ \grd c16 ] e4 a8. [ e16 ] \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  f4 a8. [ f16 ] e4 a8. [ e16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "2"))  A4 a8. [ f16 ] e4 a8. [ A16 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
- f4 \taor a8. [ e16 ] c4 a8. [ \grd b16 ] \bar ":|" \break
-
-			}
-
-\score {
-	\melody
-	\layout {
-	indent = 0.0\cm
-	\context { \Score \remove "Bar_number_engraver" }
-	}
-	\header {
-	title = "His Father's Lament for Donald MacKenzie"
-	meter = "John Ban MacKenzie, 1863"
-	arranger = "VIII. TAORLUATH DOUBLING"
-	}
-	
-}
-
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var9.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var9.ly
deleted file mode 100644
index bd014fb..0000000
--- a/piobaireachd/his_fathers_lament_for_donald_mackenzie/Var9.ly
+++ /dev/null
@@ -1,48 +0,0 @@
-\include "bagpipe.ly"
-melody = {
-		\set Staff.midiInstrument = #"bagpipe"
-		\hideKeySignature
-		\cadenzaOn
-		\once \override Score.BreakAlignment #'break-align-orders =
-			#(make-vector 3 '(instrument-name
-									left-edge
-									ambitus
-									span-bar
-									breathing-sign
-									clef
-									key-signature
-									time-signature
-									staff-bar
-									custos
-									span-bar))
-		\time 4/4
-		\bar "|:" ( \grd c4 ) e8 [ a8 ( \grd c8 ] ) \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- f4 a8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- ( \grd c4 ) e8 [ a8 ( \grd c8 ] ) \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- f4 a8 [ e8 ] \grd b4 a4 \bar ":|:" \break
-
- f4 a8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- ( \grd c4 ) e8 [ a8 ( \grd c8 ] ) \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  f4 a8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "2"))  A4 a8 [ f8 ] e4 a8 [ A8 ] \set Score.repeatCommands = #'((volta #f)) \bar "|"
- \bar "|"
- \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
- f4 e8 [ a8 e8 ] \grd b4 a4 \bar ":|" \break
-
-			}
-
-\score {
-	\melody
-	\layout {
-	indent = 0.0\cm
-	\context { \Score \remove "Bar_number_engraver" }
-	}
-	\header {
-	title = "His Father's Lament for Donald MacKenzie"
-	meter = "John Ban MacKenzie, 1863"
-	arranger = "IX. CRUNLUATH"
-	}
-	
-}
-
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/ground.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/ground.ly
deleted file mode 100644
index a6f01a7..0000000
--- a/piobaireachd/his_fathers_lament_for_donald_mackenzie/ground.ly
+++ /dev/null
@@ -1,49 +0,0 @@
-\include "bagpipe.ly"
-melody = {
-		\set Staff.midiInstrument = #"bagpipe"
-		\hideKeySignature
-		\cadenzaOn
-		\once \override Score.BreakAlignment #'break-align-orders =
-			#(make-vector 3 '(instrument-name
-									left-edge
-									ambitus
-									span-bar
-									breathing-sign
-									clef
-									key-signature
-									time-signature
-									staff-bar
-									custos
-									span-bar))
-		\time 4/4
-		\bar "|:" \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg f8. [ e16 ] \grg c8 [ e8 ] \grd b4 a4 \bar ":|" \break
- \bar "|." \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg f8. [ e16 ] \grg c8 [ e8 ] \grd b4 a4 \bar ".|" \break 
- \bar "|." \grg f8. [ e16 ] \grg c8 [ f8 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grd c8. [ b16 ] \grg a8. [ \grd c16 ] \grg e32 [ \gra e8. ] \echoa e4 \bar "|"
- \grg f8. [ e16 ] \grg c8. [ f16 ] \grg e8. [ c16 ] \grg b8 [ e8 ] \bar "|"
- \grg f8. [ e16 ] \grg c8 [ e8 ] \grd b4 a4 \bar ".|" \break 
- \set Score.repeatCommands = #'((volta "1"))  \grg \set Score.repeatCommands = #'((volta #f)) \bar "|"
- f4 e8 [ a8 e16 ] c4 a8 [ \grd b16 ] \bar ":|" \break
-
-			}
-
-\score {
-	\melody
-	\layout {
-	indent = 0.0\cm
-	\context { \Score \remove "Bar_number_engraver" }
-	}
-	\header {
-	title = "His Father's Lament for Donald MacKenzie"
-	meter = "John Ban MacKenzie, 1863"
-	arranger = "I. GROUND"
-	}
-	
-}
-
diff --git a/piobaireachd/his_fathers_lament_for_donald_mackenzie/his_fathers_lament_for_donald_mackenzie.ly b/piobaireachd/his_fathers_lament_for_donald_mackenzie/his_fathers_lament_for_donald_mackenzie.ly
deleted file mode 120000
index 1804ecc..0000000
--- a/piobaireachd/his_fathers_lament_for_donald_mackenzie/his_fathers_lament_for_donald_mackenzie.ly
+++ /dev/null
@@ -1 +0,0 @@
-../../../bagpipemusic/piobaireachd/his_fathers_lament_for_donald_mackenzie.ly
\ No newline at end of file
diff --git a/standards/24_44_standards.side.ily b/standards/24_44_standards.side.ily
index 97c4b3f..bcbdcf9 100644
--- a/standards/24_44_standards.side.ily
+++ b/standards/24_44_standards.side.ily
@@ -122,9 +122,9 @@ peight = \drummode {
 }
 pnine = \drummode {
 	\tag #'upbeat { d16. g32 } |
-	d16.:64~ d32 g16. d32:128~
-	d16. g32 d16.:64~ d32
-	g16. d32:128~ d16. g32
+	d16.:64( d32) g16. d32:64(
+	d16.) g32 d16.:64( d32)
+	g16. d32:64( d16.) g32
 	\flam d8
 }
 pten = \drummode {
@@ -136,7 +136,7 @@ pten = \drummode {
 peleven = \drummode {
 	\tag #'upbeat { d16. g32 } |
 	\flam d16. g32 d16. g32:64(
-	g16.:64 d32) g16.-> d32:64(
+	g16.:64 d32)-> g16.-> d32:64(->
 	g16.:64 g32) d16. d32
 	\flam g8
 }
diff --git a/standards/34_standards.side.ily b/standards/34_standards.side.ily
index ffd529a..4f08cb8 100644
--- a/standards/34_standards.side.ily
+++ b/standards/34_standards.side.ily
@@ -26,6 +26,8 @@ pempty = \drummode {
 	s8 |
 	s4 s4 s4 |
 }
+
+%% zero
 pone = \drummode {
 	\flamd d8 d8:32(	g8[) d8:32(]	d8:32)( d8) |
 }
@@ -57,6 +59,7 @@ pnine = \drummode {
 	\flamd d16 g16 d16 \flamg g16		d16 g16 \flamd d16 g16		d16 \flamg g16 d16 g16 |
 }
 
+%% ten
 pten = \drummode {
 	\flamd d8 \tuplet 3/2 {d16 g16 d16}		\flamd g8 \tuplet 3/2 {d16 g16 d16}		g16. d32-> g16. g32 |
 }
@@ -88,6 +91,7 @@ pnineteen = \drummode {
 	\flamd d8 d8:32(		g8[) d8:32(]		g16.) d32:64( d16.) g32 |
 }
 
+%% twenty
 ptwenty = \drummode {
 	\flamd d16. g32 d16. \flam g32		d16. g32 \flam d16. g32		d16. \flam g32 d16. g32 |
 }
diff --git a/standards/34_standards_extra.side.ly b/standards/34_standards_extra.side.ly
new file mode 100644
index 0000000..38e15db
--- /dev/null
+++ b/standards/34_standards_extra.side.ly
@@ -0,0 +1,47 @@
+\version "2.18.2"
+
+\include "./34_standards.side.ily"
+
+\score {
+	\new PipeBandDrumStaff {
+		\eighthBeaming
+		\time 3/4
+
+		\drummode {
+			\repeat volta 2 { \pone | \midone | \pone | \endone } \break
+			\repeat volta 2 { \ptwo | \midone | \ptwo | \endone } \break
+			\repeat volta 2 { \pthree | \midone | \pthree | \endone } \break
+			\repeat volta 2 { \pfour | \midone | \pfour| \endone } \break
+			\repeat volta 2 { \pfive | \midone | \pfive | \endone } \break
+			\repeat volta 2 { \psix | \midone | \psix | \endone } \break
+			\repeat volta 2 { \pseven | \midone | \pseven | \endone } \break
+			\repeat volta 2 { \peight | \midone | \peight | \endone } \break
+			\repeat volta 2 { \pnine | \midone | \pnine | \endone } \break
+			\repeat volta 2 { \pten | \midone | \pten | \endone } \break
+
+			\repeat volta 2 { \peleven | \midone | \peleven | \endone } \break
+			\repeat volta 2 { \ptwelve | \midone | \ptwelve | \endone } \break
+			\repeat volta 2 { \pthirteen | \midtwo | \pthirteen | \endtwo } \break
+			\repeat volta 2 { \pfourteen | \midone | \pfourteen | \endone } \break
+			\repeat volta 2 { \pfifteen | \midone | \pfifteen | \endone } \break
+			\repeat volta 2 { \psixteen | \midone | \psixteen | \endone } \break
+			\repeat volta 2 { \pseventeen | \midone | \pseventeen | \endone } \break
+			\repeat volta 2 { \peighteen | \midone | \peighteen | \endone } \break
+			\repeat volta 2 { \pnineteen | \midone | \pnineteen | \endone } \break
+			\repeat volta 2 { \ptwenty | \midone | \ptwenty | \endone } \break
+
+			\repeat volta 2 { \ptwentyone | \midone | \ptwentyone | \endone } \break
+			\repeat volta 2 { \ptwentytwo | \midone | \ptwentytwo | \endone } \break
+			\repeat volta 2 { \ptwentythree | \midone | \ptwentythree | \endone } \break
+			\repeat volta 2 { \ptwentyfour | \midone | \ptwentyfour | \endone } \break
+			\repeat volta 2 { \ptwentyfive | \midone | \ptwentyfive | \endone } \break
+		}% End of drums %
+	}
+	\header {
+		title = "3/4 Standards (Extra)"
+		meter = "Quick March / Retreat"
+		composer = ""
+		instrument = "Side"
+	}
+}
+
diff --git a/suites/steam_train_to_mallaig/notes.pipes.ily b/suites/steam_train_to_mallaig/notes.pipes.ily
index 9561847..c53f441 100644
--- a/suites/steam_train_to_mallaig/notes.pipes.ily
+++ b/suites/steam_train_to_mallaig/notes.pipes.ily
@@ -11,7 +11,7 @@ pipesIntro = {
 	\grg a8. \grd c16 e8		\dblg g8. \grA f16 d8 |
 	\grg e16 c8. \grg c8		\grip c8. \grg c16 b8 |
 	\grg a8. \grd c16 e8		\dblg g8. \grA f16 d8 |
-	\dble e4.				\gra e4 \grg c16  b16 |
+	\dble e4.				\gra e4 \grg c32  b16. |
 
 	\grg a8. \grd c16 e8		\dblg g8.  \grA f16 d8 |
 	\grg e16 c8. \grg c8		\grip c4. |