diff --git a/2-4_marches/caller_herrin/notes.pipes.ily b/2-4_marches/caller_herrin/notes.pipes.ily
index be2b879..c3acea7 100644
--- a/2-4_marches/caller_herrin/notes.pipes.ily
+++ b/2-4_marches/caller_herrin/notes.pipes.ily
@@ -1,4 +1,4 @@
-% 2/4 Caller Herrini
+% 2/4 Caller Herrin
 % Pipes
 \version "2.18.2"
 composerPipes = "Trad."
@@ -12,9 +12,9 @@ pipesAvI = {
 		\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 ] |
 	}
-	\dblf f8 [ b8 ] \dble e8. [ d16 ] |
-	\dblc c8 [ \gre a8 ] \dblb b8 [ c8 ] |
 
 	\grg d4 \grg d8 [ \grG e8 ] |
 	\dblc c4 \thrwd d8. [ e16 ] |
@@ -26,9 +26,9 @@ pipesAvII = {
 		\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 ] |
 	}
-	\grg f8 [ \hdblb b8 ] \dble e8. [ d16 ] |
-	\dblc c8 [ \gre a8 ] \grg b8 [ c8 ] |
 
 	\thrwd d4 \slurd d8 [ \grg e16. d32 ] |
 	\dblc c4 \thrwd d8. [ e16 ] |
@@ -46,6 +46,8 @@ pipesBvI = {
 	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 ] |
 	\tag #'fine {
 	  \removeWithTag #'fineRemove \pipesAvII
 	}
@@ -62,6 +64,8 @@ pipesBvII = {
 	A8 ] |
 	\grf g8 [ f8 ] \dble e8 [ d8 ] |
 	\grg c4 \thrwd d8. [ e16 ] |
+	\grg f8 [ \hdblb b8 ] \dble e8. [ d16 ] |
+	\dblc c8 [ \gre a8 ] \grg b8 [ c8 ] |
 	\tag #'fine {
 		\removeWithTag #'fineRemove \pipesAvII
 	}
diff --git a/2-4_marches/caller_herrin/pipes.cairns.ly b/2-4_marches/caller_herrin/pipes.cairns.ly
index f0fc04c..6a283c6 100644
--- a/2-4_marches/caller_herrin/pipes.cairns.ly
+++ b/2-4_marches/caller_herrin/pipes.cairns.ly
@@ -23,22 +23,18 @@ dsalfine = {\markTextEolDown "D.S. al Fine" }
 		<<
 			\new NullVoice = "format" {
 				\repeat volta 2 {
-					\part 
-					\measure
-					\measure
+					\part
+					\halfline
 					\mark \markup { \musicglyph "scripts.segno"}
-					%\inStaffSegno 
-					\measure
-					\measure
+					%\inStaffSegno
 					\halfline
 					\fine
 				}
 				\break
 
-				\part 
+				\part
+				\halfline
 				\halfline
-				\measure
-				\measure
 				\dsalfine
 				\bar "||"
 				%\break
diff --git a/2-4_marches/caller_herrin/pipes.ly b/2-4_marches/caller_herrin/pipes.ly
index faf9829..5b0c0e5 100644
--- a/2-4_marches/caller_herrin/pipes.ly
+++ b/2-4_marches/caller_herrin/pipes.ly
@@ -23,22 +23,18 @@ dsalfine = {\markTextEolDown "D.S. al Fine" }
 		<<
 			\new NullVoice = "format" {
 				\repeat volta 2 {
-					\part 
-					\measure
-					\measure
+					\part
+					\halfline
 					\mark \markup { \musicglyph "scripts.segno"}
-					%\inStaffSegno 
-					\measure
-					\measure
+					%\inStaffSegno
 					\halfline
 					\fine
 				}
 				\break
 
-				\part 
+				\part
+				\halfline
 				\halfline
-				\measure
-				\measure
 				\dsalfine
 				\bar "||"
 				%\break