diff --git a/2-4_marches/caller_herrin/notes.side.ily b/2-4_marches/caller_herrin/notes.side.ily
index 95826ec..80f5200 100644
--- a/2-4_marches/caller_herrin/notes.side.ily
+++ b/2-4_marches/caller_herrin/notes.side.ily
@@ -1,50 +1,54 @@
 % 2/4 Caller Herrin
 % Side
 \version "2.18.2"
-composerSide = "E.T. de Boone, v0.3"
+composerSide = "E.T. de Boone, v0.4"
 arrangerSide = ""
 sideglobal = {
 	\sixteenthBeaming
 }
 % Music
-sideA = \drummode {
-	\tag #'fineRemove {
-		\tutti {
+sideAA = \drummode {
+	\tutti {
 			\tag #'upbeat { d8:32( | }
 			d4)
 		} d4(:32 |
-		d8) \flam d8	\flam g8
-		\tutti { d8:32( |
-			g16.) d32:64~ d16. g32	\flam d16. g32 \triplet { d16 g d } |
-			g8->
-		} d8:32(	g8)
-
-		d8:32( \dr
-	}
+	d8) \flam g8	\flam \triplet { d16 d g } d8\v
+	\flamdr d8 g8:32(->	d8:32)(-> \triplet { g16) d g } |
+	d16. g32-> d16.:64( d32)	g8-> d8:32(
+}
 
+sideAB = \drummode {
 	d4)\!\fr d4:32( |
-	d8) \flam d8	\flam g8 d8:32( |
-	\triplet { g16) d g } \flam d16.
-	\tutti {
-		g32	d16.:64~-. d32-. \triplet { g16 d g } |
-		\flam d8 d8:32(	g8)
+	d8) \flam g8	\flam d8
+
+	g8\dr |
+	\flam d16.\fr g32 d16. \flamdr g32\fr
+		d16. \tutti { g32-> \triplet { d16 g d } |
+		\flam g8 d8:32(g8)
 	}
 }
+sideA = \drummode {
+	\tag #'fineRemove {
+		\sideAA
+	}
+
+	\sideAB
+}
 
 sideB = \drummode {
 	\tag #'upbeat { d32-> g d g | <>\v}
 	d4	r8 d8:32( |
-	g16.) d32 g16. g32	d8:32(
+	g16.) d32 g16. g32
 
 	\tutti {
-		d8:32)(\< |
+		d8:32(\<	d8:32)( |
 		d4)\!->	r8 d8:32( |
 		g16.) d32 g16. g32	d8:32(
 
-		d32)->
-	} g32 d g |
+		g16.)(:32->
+	} g32) |
 	d4\v	r4 |
-	r2|<> \p
+	d8:32(\> g8)\p	\optflam d8. g16 |
 
 	%\tutti {
 		<> \dr
diff --git a/2-4_marches/caller_herrin/notes.tenor.ily b/2-4_marches/caller_herrin/notes.tenor.ily
index 31e29f1..6040cb7 100644
--- a/2-4_marches/caller_herrin/notes.tenor.ily
+++ b/2-4_marches/caller_herrin/notes.tenor.ily
@@ -1,7 +1,7 @@
 % 2/4 Caller Herrin
 % Tenor
 \version "2.18.2"
-composerTenor = "E.T. de Boone, v0.1"
+composerTenor = "E.T. de Boone, v0.2"
 arrangerTenor = ""
 tenorglobal = {}
 % Music
@@ -32,7 +32,8 @@ tenorB = \drummode {
 	r4. g8
 
 	\stf d2 |
-	\flourish { d4 g4 } |
+	r2 |
+	%\flourish { d4 g4 } |
 
 
 	\flourish { d4 g4 } |