diff --git a/4-4_marches/cabar_feidh/notes.pipes.ily b/4-4_marches/cabar_feidh/notes.pipes.ily
index 0e20355..4d0f9af 100644
--- a/4-4_marches/cabar_feidh/notes.pipes.ily
+++ b/4-4_marches/cabar_feidh/notes.pipes.ily
@@ -2,6 +2,7 @@
 % Pipes
 \version "2.18.2"
 composerPipes = ""
+arrangerPipes = ""
 pipeglobal = {
 	\bagpipeKey
 	}
@@ -21,13 +22,13 @@ pipesA = {
 
 pipesB = {
  \dblg g8 |
- \grA G8. [ \grd b16 ] \thrwd d8 [ \gre G8 ] \dblb b8 [ \gre G8 ] \whslurd d8. [ b16 ] |
- \grg G8. [ \grd b16 ] \thrwd d8 [ \gre G8 ] \dblb b8. [ a16 ] \grg G8. [ \grd b16 ] |
+ \grA G8. [ b16 ] \thrwd d8 [ \gre G8 ] \dblb b8 [ \gre G8 ] \whslurd d8. [ b16 ] |
+ \grg G8. [ b16 ] \thrwd d8 [ \gre G8 ] \dblb b8. [ a16 ] \grg G8. [ b16 ] |
  \grg a8. [ \grd c16 ] \dble e8 [ a8 ] \dblc c8 [ \gre a8 ] \dble e8. [ c16 ] |
  \grg a8. [ \grd c16 ] \dble e8 [ a8 ] \dblc c8. [ b16 ] \grg a8 [ \dblg g8 ] | 
 
- \grA G8. [ \grg b16 ] \thrwd d8 [ \gre G8 ] \dblb b8 [ \gre G8 ] \whslurd d8. [ b16 ] |
- \grg G8. [ \grd b16 ] \thrwd d8 [ \gre G8 ] \dblb b8. [ a16 ] \grg G8. [ \grd b16 ] |
+ \grA G8. [ b16 ] \thrwd d8 [ \gre G8 ] \dblb b8 [ \gre G8 ] \whslurd d8. [ b16 ] |
+ \grg G8. [ b16 ] \thrwd d8 [ \gre G8 ] \dblb b8. [ a16 ] \grg G8. [ \grd b16 ] |
  \grg a8. [ b16 ] \grg c4 \grip e8. [ f16 ] \dblg g8 [ e8 ] |
  \dblA A4 \hdble e8. [ d16 ] \dblc c8. [ b16 ] \grg a8
 }
@@ -39,7 +40,7 @@ pipesC = {
  \thrwd d4 \dblA A8 [ d8 ] \dblf f8 [ d8 ] \dblA A8. [ f16 ] |
  \thrwd d8. [ e16 ] \grg f8. [ g16 ] \dblA A8. [ g16 ] \hdblf f8 [ A8 ] | 
 
- c4 \dblg g8 [ c8 ] \dble e8 [ c8 ] \dblg g8. [ e16 ] |
+ \hcatchc c4 \dblg g8 [ c8 ] \dble e8 [ c8 ] \dblg g8. [ e16 ] |
  \grg c4 \grip e8. [ f16 ] \dblg g8 [ e8 ] \dblc c8 [ e8 ] |
  \dblA A8. [ f16 ] \dblg g8 [ e8 ] \dblf f8 [ d8 ] \dble e8 [ c8 ] |
  \dblA A4 \hdble e8. [ d16 ] \dblc c8. [ b16 ] \grg a8
@@ -48,12 +49,12 @@ pipesC = {
 pipesD = {
  \dblg g8 |
  \grA G8. [ \grd G16 ] \gre G8 [ \grd b8 ] \grg G8. [ \grd G16 ] \gre G8 [ \grd b8 ] |
- \grg G8. [ \grd G16 ] \gre G8 [ \whslurd d8 ] \dblb b8. [ a16 ] \grg G8. [ \grd b16 ] |
+ \grg G8. [ \grd G16 ] \gre G8 [ \whslurd d8 ] \dblb b8. [ a16 ] \grg G8. [ b16 ] |
  \grg a8. [ \grd a16 ] \gre a8 [ \grd b8 ] \grg a8. [ \grd a16 ] \gre a8 [ \grd b8 ] |
  \grg a8. [ \grd a16 ] \gre a8 [ e8 ] \dblc c8. [ b16 ] \grg a8 [ \dblg g8 ] | 
 
  \grA G8. [ \grd G16 ] \gre G8 [ \grd b8 ] \grg G8. [ \grd G16 ] \gre G8 [ \grd b8 ] |
- \grg G8. [ \grd G16 ] \gre G8 [ \whslurd d8 ] \dblb b8. [ a16 ] \grg G8. [ \grd b16 ] |
+ \grg G8. [ \grd G16 ] \gre G8 [ \whslurd d8 ] \dblb b8. [ a16 ] \grg G8. [ b16 ] |
  \grg a8. [ b16 ] \grg c4 \grip e8. [ f16 ] \dblg g8 [ e8 ] |
  \dblA A4 \hdble e8. [ d16 ] \dblc c8. [ b16 ] \grG a8
 }
diff --git a/4-4_marches/when_the_pipers_play/notes.pipes.ily b/4-4_marches/when_the_pipers_play/notes.pipes.ily
deleted file mode 100644
index 64e4721..0000000
--- a/4-4_marches/when_the_pipers_play/notes.pipes.ily
+++ /dev/null
@@ -1,34 +0,0 @@
-% 4/4 When the Pipers play
-% Pipes
-\version "2.18.2"
-composerPipes = ""
-arrangerPipes = "J. Tuttle"
-pipeglobal = {
-	\bagpipeKey
-	}
-% Music
-pipesA = {
-	\tuplet 3/2 { a8 d8 e8  } |
-	\grg f2~ f8 [ e8 ] d8. [ b16 ] |
-	\grG a2~ a8 [ d8 ] \grg d8 [ c8 ] |
-	\thrwd d2~ d8 [ \grg d16 e16 ] f8. [ g16 ] |
-	\hdble e2~ e8 [ \grg e8 ] f8 [ g8 ] | 
-	
-	\dblA A2~ A8 [ g16 f16 ] e8 [ d8 ] |
-	\grg f8. [ d16 ] a4. \grg f8 d8 [ b8 ] |
-	\grg a8. [ e16 ] \grG e4. a8 \grg \tuplet 3/2 { a8 b8 d8 } |
-	\grg d2~ d4
-}
-
-pipesB = {
-	\tuplet 3/2 { a8 d8 e8 } |
-	\grg f2~ f8 [ e8 ] d8 [ A8 ] |
-	\hdblf f2~ f8 [ d8 ] e8 [ c8 ] |
-	\thrwd d2~ d8 [ \grg d16 e16 ] f8. [ g16 ] |
-	\hdble e2~ e8 [ A8 ] \grg A8. [ f16 ] | 
-
-	d16 [ f8.~ ] f4. e8 d8. [ b16 ] |
-	\grG a2~ a8 [ \grg f8 ] d8 [ b8 ] |
-	\grg a8. [ e16 ] \gra e4. a8 \grg \tuplet 3/2 { a8 b8 d8 } |
-	\grg d2~ d4 
-}
diff --git a/6-8_marches/cock_o_the_north/notes.pipes.ily b/6-8_marches/cock_o_the_north/notes.pipes.ily
index 460fda4..4d2e68b 100644
--- a/6-8_marches/cock_o_the_north/notes.pipes.ily
+++ b/6-8_marches/cock_o_the_north/notes.pipes.ily
@@ -8,61 +8,61 @@ pipeglobal = {
 % Music
 pipesA = {
 	A8 |
-	c16 [ \grd a8. \grd c8 ] \dblb b4 \grG a8 |
+	c16 [ \grd a8. c8 ] \dblb b4 \grG a8 |
 	\grg a8. [ \grd c16 e8 ] \dblf f4 e8 |
-	\grg c16 [ \grd a8. \grd c8 ] \dblc c8. [ b16 \grG a8 ] |
-	\grg b4. \taor b4 A8 | 
+	\grg c16 [ \grd a8. c8 ] \dblc c8. [ b16 \grG a8 ] |
+	\grg b4. \gre b4 A8 | 
 
-	c16 [ \grd a8. \grd c8 ] \dblb b4 \grG a8 |
+	c16 [ \grd a8. c8 ] \dblb b4 \grG a8 |
 	\grg a8. [ \grd c16 e8 ] \dblf f4 e8 |
-	\grg c16 [ \grd a8. \grd c8 ] \dblb b4 \gre G8 |
+	\grg c16 [ \grd a8. c8 ] \dblb b4 G8 |
 	\grg a4. \wbirl a4 
 }
 pipesBA = {
 	\dblg g8 |
 	\dblA A4 e8 \dblf f4 e8 |
 	\dblA A4 e8 \dblf f4 e8 |
-	\grg c16 [ \grd a8. \grd c8 ] \dblc c8. [ b16 \grG a8 ] |
+	\grg c16 [ \grd a8. c8 ] \dblc c8. [ b16 \grG a8 ] |
 	\grg b4. 
 }
 pipesBBA = {
-	\taor b4 \dblg g8 |
+	\gre b4 \dblg g8 |
 	\dblA A4 e8 \dblf f4 e8 |
 	\dblA A4 e8 \dblf f4 e8 |
-	\grg c16 [ \grd a8. \grd c8 ] \dblb b4 \gre G8 |
+	\grg c16 [ \grd a8. c8 ] \dblb b4 G8 |
 	\grg a4. \wbirl a4 
 }
 pipesBBB = {
-	b8. [ \grg c16 d8 ] |
+	\grg b8. [ \grg c16 d8 ] |
 	\grg c16 [ e8. c8 ] \dblb b4 \grG a8 |
 	\grg a8. [ \grd c16 e8 ] \dblf f4 e8 |
-	\grg c16 [ \grd a8. \grd c8 ] \dblb b4 \gre G8 |
+	\grg c16 [ \grd a8. c8 ] \dblb b4 G8 |
 	\grg a4. \wbirl a4 
 }
 
 pipesC = {
 	\dblA A8 |
-	c4 \taor c8 \dblc c8. [ b16 \grG a8 ] |
+	c4 \grG c8 \grg c8. [ b16 \grG a8 ] |
 	\grg c4 \grip e8 \dblf f4 e8 |
-	\grg c4 \taor c8 \dblc c8. [ b16 \grG a8 ] |
-	\grg b4. \taor b4 A8 | 
+	\grg c4 \grG c8 \grg c8. [ b16 \grG a8 ] |
+	\grg b4. \gre b4 A8 | 
 
-	c4 \taor c8 \dblc c8. [ b16 \grG a8 ] |
+	c4 \grG c8 \grg c8. [ b16 \grG a8 ] |
 	\grg c4 \grip e8 \dblf f4 e8 |
-	\grg c16 [ \grd a8. \grd c8 ] \dblb b4 \gre G8 |
+	\grg c16 [ \grd a8. c8 ] \dblb b4 G8 |
 	\grg a4. \wbirl a4 
 }
 pipesDA = {
 	\dblg g8 |
 	\dblA A4 e8 \dblf f4 e8 |
 	\grg f16 [ A8. e8 ] \dblf f4 e8 |
-	c16 [ A8. c8 ] \dblc c8. [ b16 \grG a8 ] |
+	\grg c16 [ A8. c8 ] \dblc c8. [ b16 \grG a8 ] |
 	\grg b4. 
 }
 pipesDBA = {
-	\taor b4 \dblg g8 |
+	\gre b4 \dblg g8 |
 	\dblA A4 e8 \dblf f4 e8 |
 	\grg f16 [ A8. e8 ] \dblf f4 e8 |
-	c16 [ \grd a8. \grd c8 ] \dblb b4 \gre G8 |
+	c16 [ \grd a8. c8 ] \dblb b4 G8 |
 	\grg a4. \wbirl a4 
 }
diff --git a/6-8_marches/farewell_to_the_creeks/notes.pipes.ily b/6-8_marches/farewell_to_the_creeks/notes.pipes.ily
index c761ea1..75c5164 100644
--- a/6-8_marches/farewell_to_the_creeks/notes.pipes.ily
+++ b/6-8_marches/farewell_to_the_creeks/notes.pipes.ily
@@ -2,19 +2,19 @@
 % Pipes
 \version "2.18.2"
 composerPipes = "PM J. Robertson"
-arrangerPipes = ""
+arrangerPipes = "Seaforths of Holland"
 pipeglobal = {
 	\bagpipeKey
 }
 % Music
 pipesA = {
 	A8 |
-	\hdble e4 c8 \grg c8. [ b16 \grd c8 ] |
+	\hdble e4 c8 \grg c8. [ b16 c8 ] |
 	\thrwd d8. [ e16 f8 ] \dble e4 d8 |
-	\grg c4 \grip e8 \grg a8. [ \grd c16 e8 ] |
+	\grg c4 \grip e8 \grg a8. [ c16 e8 ] |
 	\dble e8. [ d16 c8 ] \dblb b4 A8 | 
 
-	\hdble e4 c8 \grg c8. [ b16 \grd c8 ] |
+	\hdble e4 c8 \grg c8. [ b16 c8 ] |
 	\thrwd d8. [ e16 f8 ] \dble e4 d8 |
 	\grg c4 \grip e8 \dble e8. [ d16 c8 ] |
 	\dblb b4. \grG a4 
@@ -23,12 +23,12 @@ pipesA = {
 pipesB = {
 	f8 |
 	\dble e8. [ c16 e8 ] \grg f16 [ A8. g8 ] |
-	\hdblf f8. [ d16 f8 ] \grg e8. [ c16 \grd a8 ] |
-	\grg c4 \taor c8 \grg c16 [ e8. c8 ] |
+	\hdblf f8. [ d16 f8 ] \grg e8. [ c16 a8 ] |
+	\grg c4 \grip c8 \grg c16 [ e8. c8 ] |
 	\grg d8. [ c16 d8 ] \dblb b4 f8 | 
 
 	\dble e8. [ c16 e8 ] \grg f16 [ A8. g8 ] |
-	\hdblf f8. [ d16 f8 ] \grg e8. [ c16 \grd a8 ] |
+	\hdblf f8. [ d16 f8 ] \grg e8. [ c16 a8 ] |
 	\grg c4 \grip e8 \dble e8. [ d16 c8 ] |
 	\dblb b4. \grG a4
 }
@@ -36,12 +36,12 @@ pipesB = {
 pipesC = {
 	A8 |
 	\hdblc c4. \thrwd d4 f8 |
-	\grg c16 [ e8. c8 ] \grg c8. [ b16 \grd a8 ] |
+	\grg c16 [ e8. c8 ] \grg c8. [ b16 a8 ] |
 	\thrwd d4 f8 \dblc c4 e8 |
 	\dble e8. [ d16 c8 ] \dblb b4 A8 | 
 
 	\hdblc c4. \thrwd d4 f8 |
-	\grg c16 [ e8. c8 ] \grg c8. [ b16 \grd a8 ] |
+	\grg c16 [ e8. c8 ] \grg c8. [ b16 a8 ] |
 	\grg c4 \grip e8 \dble e8. [ d16 c8 ] |
 	\dblb b4. \grG a4
 }
@@ -49,12 +49,12 @@ pipesC = {
 pipesD = {
 	e8 |
 	\dblA A4 e8 \grg f4 A8 |
-	\dble e8 [ e8. f16 ] \grg e8. [ c16 \grd a8 ] |
+	\dble e8 [ e8. f16 ] \grg e8. [ c16 a8 ] |
 	\thrwd d4 f8 \dblc c4 e8 |
 	\dble e8. [ d16 c8 ] \dblb b4 e8 | 
 
 	\dblA A4 e8 \grg f4 A8 |
-	\dble e8 [ e8. f16 ] \grg e8. [ c16 \grd a8 ] |
+	\dble e8 [ e8. f16 ] \grg e8. [ c16 a8 ] |
 	\grg c4 \grip e8 \dble e8. [ d16 c8 ] |
 	\dblb b4. \grG a4
 }
diff --git a/4-4_marches/when_the_pipers_play/config.ily b/airs/when_the_pipers_play/config.ily
similarity index 75%
rename from 4-4_marches/when_the_pipers_play/config.ily
rename to airs/when_the_pipers_play/config.ily
index 979a284..9d2ee84 100644
--- a/4-4_marches/when_the_pipers_play/config.ily
+++ b/airs/when_the_pipers_play/config.ily
@@ -4,14 +4,14 @@ global = {
 	\time 4/4
 	}
 confTempo = { 
-	\tempo 4 = 80 
+	\tempo 4 = 70 
 	}
 %% Format
-part = { \partial 4 s4 }
+part = { \partial 8*3 \grace {s4} s8*3 }
 measure = { \grace {s1} s1 | }
 halfline = { \repeat unfold 4 \measure }
 line = { \repeat unfold 2 { \halfline } }
 
 %% Headers
 title = "When the Pipers play"
-meter = "March"
+meter = "Slow Air"
diff --git a/airs/when_the_pipers_play/notes.pipes.ily b/airs/when_the_pipers_play/notes.pipes.ily
new file mode 100644
index 0000000..a02479f
--- /dev/null
+++ b/airs/when_the_pipers_play/notes.pipes.ily
@@ -0,0 +1,22 @@
+% 4/4 When the Pipers play
+% Pipes
+\version "2.18.2"
+composerPipes = ""
+arrangerPipes = ""
+pipeglobal = {
+	\bagpipeKey
+}
+
+% Music
+pipesA = {
+	a8 \thrwd d8. [ e16 ] |
+	\grg f2~ f8 [ %{^te%} e8 ] \thrwd d8. [ b16 ]  |
+	\grG a2~ a8 [ %{^te%} d8 ] \grg d8 [ c8 ] |
+	\thrwd d2~ d8. [ %{^te%} e16 ] \grg f8. [ g16 ] |
+	\dble e2~ e8 [ %{^te%} \gra e8 ] f8 [ g8 ] |
+
+	\dblA A2~ A8 [ %{^te%} g16 f16 ] \dble e8 [ d8 ] |
+	\grg f8. [ d16 ] \grG a4. f8 d8 [ b8 ] |
+	\grG a2~ a8 [ %{^te%} \grg a16 b16 ] \grg d8. [ e16 ] |
+	\thrwd d2~ d8 %{^te%} 
+}
diff --git a/airs/when_the_pipers_play/notes.pipes.seconds.ily b/airs/when_the_pipers_play/notes.pipes.seconds.ily
new file mode 100644
index 0000000..12cc419
--- /dev/null
+++ b/airs/when_the_pipers_play/notes.pipes.seconds.ily
@@ -0,0 +1,22 @@
+% 4/4 When the Pipers Play
+% Pipes (Seconds)
+\version "2.18.2"
+composerPipesSecnd = ""
+arrangerPipesSecnd = ""
+pipessecndglobal = {
+	\bagpipeKey
+}
+
+% Music
+pipessecndA = {
+	a8 \thrwd d8. [ e16 ] |
+	\grg f2~ f8 [ %{^te%} e8 ] d8 [ A8 ] |
+	\hdblf f2~ f8 [ %{^te%} d8 ] f8 [ c8 ] |
+	\thrwd d2~ d8. [ %{^te%} e16 ] \grg f8. [ g16 ] |
+	\hdble e2~ e8 [ %{^te%} A8 ] \grg A8 [ e8 ] |
+
+	f2~ f8 [ %{^te%} e16 d16 ] c8 [ b8 ] |
+	\grG a2~ a8 [ %{^te%} \grg f8 ] d8  [ b8 ] |
+	\grg a8. [ e16 ] \gra e4. a16 [ \grg a16 ] b8 [ d8 ] |
+	\grg d2~ d8 %{^te%} 
+}
diff --git a/airs/when_the_pipers_play/pipes.full.ly b/airs/when_the_pipers_play/pipes.full.ly
new file mode 100644
index 0000000..c58d087
--- /dev/null
+++ b/airs/when_the_pipers_play/pipes.full.ly
@@ -0,0 +1,115 @@
+\version "2.19.0"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+\include "./notes.pipes.seconds.ily"
+%\include "./notes.pipes.thirds.ily"
+
+\layout {
+	indent = 8.0
+	short-indent = 2.0
+}
+
+\score {
+	\new StaffGroup <<
+		\new Staff = "pipes" \with {
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
+			\global
+			\pipeglobal
+			<<
+			  	\new NullVoice = "format" {
+					\repeat volta 2 {
+						\part
+						\line
+					}
+				}%Format
+				\new Voice = "pipes" {
+					\pipesA s8*3
+				}%Pipes
+			>>
+		}
+		\new Staff = "seconds" \with {
+			instrumentName = \markup{ \instrumentPipesSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
+		} {
+			\pipessecndglobal
+
+			\pipessecndA s8*3
+
+		}
+%{		\new Staff = "thirds" \with {
+			instrumentName = \markup{ \instrumentPipesThrd }
+			shortInstrumentName = \markup{ \shortInstrumentPipeTthrd }
+		} {
+			\pipesthrdglobal
+
+		}
+%}
+	>>
+	\header {
+		title = \title
+		meter = \meter
+		composer = \markup \large {
+			\column \right-align {
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \composerPipes  ":" }} #} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \composerPipessecnd ":" }} #} )
+				$(if (not (string=? "" composerPipesthrd))  #{ \markup {\line { \composerPipesthrd  ":" }} #} )
+			}
+			\column \right-align {
+				$(if (not (string=? "" composerPipes))  #{ \markup {\line { \instrumentPipes }}#} )
+				$(if (not (string=? "" composerPipessecnd))  #{ \markup {\line { \instrumentPipessecnd }}#} )
+				$(if (not (string=? "" composerPipesthrd))  #{ \markup {\line { \instrumentPipesthrd }}#} )
+			}
+		}
+	}
+}
+\score {
+	\new StaffGroup <<
+		\global
+		\new Staff = "pipes" \with {
+			midiInstrument = #"bagpipe"
+			instrumentName = \markup{ \instrumentPipes }
+			shortInstrumentName = \markup{ \shortInstrumentPipes }
+		} {
+			\pipeglobal
+			%%Tune
+			\partial 8*3
+			\pipesA
+			\pipesA
+
+		}
+		\new Staff = "seconds" \with {
+			midiInstrument = #"bagpipe"
+			instrumentName = \markup{ \instrumentPipesSecnd }
+			shortInstrumentName = \markup{ \shortInstrumentPipesSecnd }
+		} {
+			\pipessecndglobal
+			%% Seconds
+
+			\partial 8*3
+			\pipessecndA
+			\pipessecndA
+
+		}
+%{		\new Staff = "thirds" \with {
+			midiInstrument = #"bagpipe"
+			instrumentName = \markup{ \instrumentPipesThrd }
+			shortInstrumentName = \markup{ \shortInstrumentPipeThrd }
+		} {
+			\pipesthrdglobal
+			%% Thirds
+		}
+%}
+	>>
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+	}
+}
diff --git a/4-4_marches/when_the_pipers_play/pipes.ly b/airs/when_the_pipers_play/pipes.ly
similarity index 83%
rename from 4-4_marches/when_the_pipers_play/pipes.ly
rename to airs/when_the_pipers_play/pipes.ly
index 47dacf5..7c01ff6 100644
--- a/4-4_marches/when_the_pipers_play/pipes.ly
+++ b/airs/when_the_pipers_play/pipes.ly
@@ -15,17 +15,10 @@
 					\part
 					\line
 				}
-				\break
-				\repeat volta 2 {
-					\part
-					\line
-				}
 			}%Format
 			
 			\new Voice = "pipes" {
-				\pipesA s4
-
-				\pipesB s4
+				\pipesA s8*3
 			}
 		>>
 	}
@@ -34,17 +27,17 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }
+
 \score {
 	\new Staff { \global \pipeglobal
 		\set Staff.midiInstrument = #"bagpipe"
 		%%Tune
-		\partial 4
+		\partial 8*3
 		\pipesA
 		\pipesA
-		\pipesB
-		\pipesB
 	}
 	\midi { \confTempo }
 	\header {
@@ -52,5 +45,6 @@
 		meter = \meter
 		instrument = \instrumentPipes
 		composer = \composerPipes
+		arranger = \arrangerPipes
 	}
 }
diff --git a/airs/when_the_pipers_play/pipes.seconds.ly b/airs/when_the_pipers_play/pipes.seconds.ly
new file mode 100644
index 0000000..2861e30
--- /dev/null
+++ b/airs/when_the_pipers_play/pipes.seconds.ly
@@ -0,0 +1,50 @@
+\version "2.18.2"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.seconds.ily"
+
+\score {
+    \new Staff {
+		\global
+		\pipessecndglobal
+		<<
+			\new NullVoice = "format" {
+				\repeat volta 2 {
+					\part
+					\line
+				}
+			}%Format
+			
+			\new Voice = "seconds" {
+				\pipessecndA s8*3
+			}
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSecnd
+		composer = \composerPipesSecnd
+		arranger = \arrangerPipesSecnd
+	}
+}
+
+\score {
+	\new Staff { \global \pipessecndglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\partial 8*3
+		\pipessecndA
+		\pipessecndA
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentSecnd
+		composer = \composerPipesSecnd
+		arranger = \arrangerPipesSecnd
+	}
+}
diff --git a/template/pipes.full.ly b/template/pipes.full.ly
index 485d488..18b81b8 100644
--- a/template/pipes.full.ly
+++ b/template/pipes.full.ly
@@ -90,8 +90,8 @@
 		} {
 			\pipesthrdglobal
 			%% Thirds
-
-%}		}
+		}
+%}
 	>>
 	\midi { \confTempo }
 	\header {