diff --git a/2-4_marches/caller_herrin/notes.pipes.ily b/2-4_marches/caller_herrin/notes.pipes.ily
index 43329ac..be2b879 100644
--- a/2-4_marches/caller_herrin/notes.pipes.ily
+++ b/2-4_marches/caller_herrin/notes.pipes.ily
@@ -2,14 +2,17 @@
 % Pipes
 \version "2.18.2"
 composerPipes = "Trad."
-arrangerPipes = "A.M. Cairns"
+arrangerPipesvI = "A.M. Cairns"
+arrangerPipesvII = "M. Bain" % PM Mike Bain, SHoC
 pipeglobal = {
 	\key d \major
 }
-pipesA = {
-	\grg a8 |
-	\grg d4 \grg d8 [ \grG e8 ] |
-	\dblc c4 \thrwd d8. [ e16 ] |
+pipesAvI = {
+	\tag #'fineRemove {
+		\tag #'upbeat {\grg a8 |}
+		\grg d4 \grg d8 [ \grG e8 ] |
+		\dblc c4 \thrwd d8. [ e16 ] |
+	}
 	\dblf f8 [ b8 ] \dble e8. [ d16 ] |
 	\dblc c8 [ \gre a8 ] \dblb b8 [ c8 ] |
 
@@ -18,21 +21,53 @@ pipesA = {
 	\dblf f8 [ g8 ] \grA e8. [ f16 ] |
 	\thrwd d4 \slurd d8
 }
+pipesAvII = {
+	\tag #'fineRemove {
+		\tag #'upbeat {\grg a16. b32 |}
+		\thrwd d4 \slurd d8 [ \grg e16. d32 ] |
+		\dblc c4 \thrwd d8. [ e16 ] |
+	}
+	\grg f8 [ \hdblb b8 ] \dble e8. [ d16 ] |
+	\dblc c8 [ \gre a8 ] \grg b8 [ c8 ] |
 
-pipesB = {
+	\thrwd d4 \slurd d8 [ \grg e16. d32 ] |
+	\dblc c4 \thrwd d8. [ e16 ] |
+	\grg f8 [ g8 ] \grA e8. f16 |
+	\thrwd d4 \slurd d8
+}
+
+pipesBvI = {
 	A8 |
 	\grf g8 [ f8 ] \dble e8 [ d8 ] |
 	\dblc c8 [ b8 ] \grG a8 [ A8 ] |
 	\grf g8 [ f8 ] \dble e8 [ d8 ] |
-	\dblc c8 [ b8 ] \grG a8 [ A8 ] |
+	\dblc c8 [ b8 ] \grG a8 [
 
+	A8 ] |
 	\grf g8 [ f8 ] \dble e8 [ d8 ] |
 	\dbld d8 [ c8 ] \grg d8. [ e16 ] |
-	\dblf f8 [ b8 ] \dble e8. [ d16 ] |
-	\dblc c8 [ \gre a8 ] \dblb b8 [ c8 ] |
-
-	\grg d4 \grg d8 [ \grG e8 ] |
-	\dblc c4 \thrwd d8. [ e16 ] |
-	\dblf f8 [ g8 ] \grA e8. [ f16 ] |
-	\thrwd d4 \slurd d8
+	\tag #'fine {
+	  \removeWithTag #'fineRemove \pipesAvII
+	}
 }
+pipesBvII = {
+	A8 |
+	\grf g8 [ f8 ] \dble e8 [ d8 ] |
+	\dblc c8 [ b ] \grG a8 [ A8 ] |
+	\grf g8 [ f8 ] \dble e8 [ d8 ] |
+
+	\tag #'simpleRemove { \dblc c16. [ d32 b16. d32 ]  a8 [ }
+	\tag #'simpleKeep { \dblc c8 [ b8 ] \grG a8 [ }
+
+	A8 ] |
+	\grf g8 [ f8 ] \dble e8 [ d8 ] |
+	\grg c4 \thrwd d8. [ e16 ] |
+	\tag #'fine {
+		\removeWithTag #'fineRemove \pipesAvII
+	}
+}
+
+
+arrangerPipes = \arrangerPipesvII
+pipesA = { \pipesAvII }
+pipesB = { \removeWithTag #'simpleRemove \pipesBvII }
diff --git a/2-4_marches/caller_herrin/pipes.cairns.ly b/2-4_marches/caller_herrin/pipes.cairns.ly
new file mode 100644
index 0000000..f0fc04c
--- /dev/null
+++ b/2-4_marches/caller_herrin/pipes.cairns.ly
@@ -0,0 +1,88 @@
+\version "2.18.2"
+
+\include "bagpipe.ly"
+
+\include "./config.ily"
+\include "./notes.pipes.ily"
+
+markTextEolDown = #(define-music-function (parser location text) (string?) #{
+    \once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+    \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+    \once \override Score.RehearsalMark #'direction = #DOWN
+    \mark \markup $text
+#})
+
+fine = {\markTextEolDown "Fine" }
+dsalfine = {\markTextEolDown "D.S. al Fine" }
+
+
+\score {
+    \new Staff {
+		\global
+		\pipeglobal
+		<<
+			\new NullVoice = "format" {
+				\repeat volta 2 {
+					\part 
+					\measure
+					\measure
+					\mark \markup { \musicglyph "scripts.segno"}
+					%\inStaffSegno 
+					\measure
+					\measure
+					\halfline
+					\fine
+				}
+				\break
+
+				\part 
+				\halfline
+				\measure
+				\measure
+				\dsalfine
+				\bar "||"
+				%\break
+				%\halfline
+				%\break
+				%\halfline
+				%\bar "|."
+			} % Format
+			\new Voice = "pipes" {
+				\pipesAvI s8
+
+				\removeWithTag #'fine \pipesBvI
+			} % Pipes
+		>>
+	}
+	\header {
+		title = \title
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipesvI
+	}
+}
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\partial 8
+		\unfoldRepeats {
+			\repeat volta 2 {
+				\pipesAvI
+			}
+			\removeWithTag #'fine \pipesBvI
+			\removeWithTag #'fineRemove \pipesAvI
+		}
+
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		subtitle = \subtitle
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipesvI
+	}
+}
diff --git a/2-4_marches/caller_herrin/pipes.ly b/2-4_marches/caller_herrin/pipes.ly
index 068999c..faf9829 100644
--- a/2-4_marches/caller_herrin/pipes.ly
+++ b/2-4_marches/caller_herrin/pipes.ly
@@ -5,28 +5,53 @@
 \include "./config.ily"
 \include "./notes.pipes.ily"
 
+markTextEolDown = #(define-music-function (parser location text) (string?) #{
+    \once \override Score.RehearsalMark #'break-visibility = #end-of-line-visible
+    \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+    \once \override Score.RehearsalMark #'direction = #DOWN
+    \mark \markup $text
+#})
+
+fine = {\markTextEolDown "Fine" }
+dsalfine = {\markTextEolDown "D.S. al Fine" }
+
+
 \score {
     \new Staff {
 		\global
+		\pipeglobal
 		<<
-			{
+			\new NullVoice = "format" {
 				\repeat volta 2 {
-					\part \halfline
+					\part 
+					\measure
+					\measure
+					\mark \markup { \musicglyph "scripts.segno"}
+					%\inStaffSegno 
+					\measure
+					\measure
 					\halfline
+					\fine
 				}
 				\break
 
-				\part \halfline
-				\break
-				\line
-				\bar "|."
-			}
-			{
-			\pipesA s8
+				\part 
+				\halfline
+				\measure
+				\measure
+				\dsalfine
+				\bar "||"
+				%\break
+				%\halfline
+				%\break
+				%\halfline
+				%\bar "|."
+			} % Format
+			\new Voice = "pipes" {
+				\pipesA s8
 
-			\pipesB
-
-			}
+				\removeWithTag #'fine \pipesB
+			} % Pipes
 		>>
 	}
 	\header {
@@ -37,3 +62,27 @@
 		arranger = \arrangerPipes
 	}
 }
+\score {
+	\new Staff { \global \pipeglobal
+		\set Staff.midiInstrument = #"bagpipe"
+		%%Tune
+		\partial 8
+		\unfoldRepeats {
+			\repeat volta 2 {
+				\pipesA
+			}
+			\removeWithTag #'fine \pipesB
+			\removeWithTag #'fineRemove \pipesA
+		}
+
+	}
+	\midi { \confTempo }
+	\header {
+		title = \title
+		subtitle = \subtitle
+		meter = \meter
+		instrument = \instrumentPipes
+		composer = \composerPipes
+		arranger = \arrangerPipes
+	}
+}