diff --git a/6-8_marches/mrs_macdonald_of_uig/config.ily b/6-8_marches/mrs_macdonald_of_uig/config.ily
deleted file mode 100644
index 2059768..0000000
--- a/6-8_marches/mrs_macdonald_of_uig/config.ily
+++ /dev/null
@@ -1,18 +0,0 @@
-\version "2.19.0"
-%% Globals
-global = {
-	\key a \mixolydian
-	\time 6/8
-	}
-confTempo = { 
-	\tempo 4. = 90 
-	}
-%% Format
-part = { \partial 8 \grace{s4.} s8 }
-measure = { \grace {s1} s2. | }
-halfline = { \repeat unfold 4 \measure }
-line = { \repeat unfold 2 { \halfline } }
-
-%% Headers
-title = "Mrs. MacDonald of Uig"
-meter = "March"
diff --git a/6-8_marches/mrs_macdonald_of_uig/notes.pipes.ily b/6-8_marches/mrs_macdonald_of_uig/notes.pipes.ily
deleted file mode 100644
index d2ac0b1..0000000
--- a/6-8_marches/mrs_macdonald_of_uig/notes.pipes.ily
+++ /dev/null
@@ -1,83 +0,0 @@
-% 6/8 Mrs. MacDonald of Uig
-% Pipes
-\version "2.24.1"
-composerPipes = "PM Donald MacLeod, MBE"
-arrangerPipes = ""
-sourcePipes = "The Cabarfeidh Collection, 110"
-pipeglobal = {
-	\key a \mixolydian
-}
-% Music
-pipesMid = {
-	\hdble e8. d16 b8	\grg a4 \taor a8 |
-	\grg G8. \grd b16 e8	\dbld d8. b16 \grd G8 |
-}
-pipesEnd = {
-	\hdble e8. d16 b8	\grg b16 g8. b8 |
-	\grg a8. \grd b16 \gre G8	\grd a4
-}
-pipesA = {
-	e8 |
-	\repeat unfold 2 {
-		\grg a4 \taor a8	\grg a8. \grd b16 \gre G8 |
-		\grg a8. \grg b16 d8	\dble e8. d16 g8 |
-
-		\alternative {
-			\pipesMid
-			\pipesEnd
-		}
-	}
-}
-
-pipesBA = {
-	\grg a8. A16 \grg A8	g16 \grA e8. A8 |
-	a8. A16 \grg A8	\hdble e8. d16 g8 |
-	\pipesMid
-}
-pipesBBA = {
-	\grg a8. A16 \grg A8	g16 \grA e8. A8 |
-	a8. A16 \grg A8	\hdble e8. d16 g8 |
-
-	\hdble e4 d8	\grg e16 g8. b8 |
-	\grg a8. \grd b16 \gre G8	\grd a4.
-}
-pipesBBB = {
-	\dble e4.	\grg a4 \taor a8 |
-	\grg b8. e16 \gra e8	\grg d8. e16 f8 |
-	% slightly tweaked pipesEnd
-	\grA g8. f16 \grg e8	\grg d16 g8. b8 |
-	\grg a8. \grd b16 \gre G8	\grd a4
-}
-
-pipesC = {
-	g16 \grA f8. |
-	\dble e4 d8	\grg e4 \taor a8 |
-	g8. e16 \grg d8	\grg e4 \taor a8 |
-	\hdblg g4 f8	\dble e4 d8 |
-	\slurb b4 e8	\dbld d8. b16 \grd G8 |
-
-	\dble e4 d8	\grg e4 \taor a8 |
-	g8. e16 \grg d8	\grg e8. f16 g8 |
-	A8. g16 \grA e8	\grg d16 g8. b8 |
-	\grg a8. \grd b16 \gre G8	\grd a4
-}
-
-pipesDA = {
-	\grg e8 |
-	A8. e16 \gra e8	A4 \grip A8 |
-	e8. f16 g8	A8. f16 \grA e8 |
-	g8. e16 \grg d8	\grA g4 \grip g8 |
-	\thrwd d8. e16 f8	\grA g8. e16 \grg d8
-}
-pipesDBA = {
-	A8. e16 \gra e8	A4 \grip A8 |
-	g8. f16 \grg e8	\thrwd d8. e16 f8 |
-	\grA g8. f16 \grg e8	\grg d16 g8. b8 |
-	\grg a8. \grd b16 \gre G8	\grd a4
-}
-pipesDBB = {
-	\grg e8. f16 g8	\grA f8. g16 A8 |
-	g8. f16 \grg e8	\thrwd d8. e16 f8 |
-	\grA g8. f16 \grg e8	\grg d16 g8. b8 |
-	\grg a8. \grd b16 \gre G8	\grd a4
-}
diff --git a/6-8_marches/mrs_macdonald_of_uig/pipes.ly b/6-8_marches/mrs_macdonald_of_uig/pipes.ly
deleted file mode 100644
index 32647b3..0000000
--- a/6-8_marches/mrs_macdonald_of_uig/pipes.ly
+++ /dev/null
@@ -1,100 +0,0 @@
-\version "2.24.1"
-
-\include "bagpipe.ly"
-
-\include "./config.ily"
-\include "./notes.pipes.ily"
-
-hbreak = {}
-\score {
-    \new Staff {
-		\global
-		\pipeglobal
-		<<
-			\new NullVoice = "format" {
-				% \line
-				\repeat volta 2 {
-					\part
-					\halfline
-					\hbreak
-					\halfline
-				}
-				\break
-				\section
-				\repeat volta 2 {
-					\halfline
-					\alternative {
-						\halfline
-						\halfline
-					}
-				}
-				\break
-				\section
-				\repeat volta 2 {
-					\partial 4 s4
-					\halfline
-					\hbreak
-					\halfline
-				}
-				\break
-				\section
-				\repeat volta 2 {
-					\part \halfline
-					\alternative {
-						\halfline
-						\halfline
-					}
-				}
-			}%Format
-			\new Voice = "pipes" {
-				\pipesA s8
-
-				\pipesBA
-				\pipesBBA
-				\pipesBBB s8
-
-				\pipesC s8
-
-				\pipesDA
-				\pipesDBA s8
-				\pipesDBB s8
-			}%Pipes
-		>>
-	}
-	\header {
-		title = \title
-		subtitle = \subtitle
-		meter = \meter
-		instrument = \instrumentPipes
-		composer = \composerPipes
-		arranger = \arrangerPipes
-	}
-}
-\score {
-	\new Staff { \global \pipeglobal
-		\set Staff.midiInstrument = #"bagpipe"
-		%%Tune
-		\partial 8
-		\pipesA \pipesA a8
-
-		\pipesBA \pipesBBA
-		\pipesBA \pipesBBB
-
-		\partial 4
-		\pipesC 
-		\partial 4 
-		\pipesC
-
-		\pipesDA \pipesDBA
-		\pipesDA \pipesDBB
-	}
-	\midi { \confTempo }
-	\header {
-		title = \title
-		subtitle = \subtitle
-		meter = \meter
-		instrument = \instrumentPipes
-		composer = \composerPipes
-		arranger = \arrangerPipes
-	}
-}
diff --git a/reels/jock_wilsons_ball/full.ly b/reels/jock_wilsons_ball/full.ly
index dca7b02..14b53f6 100644
--- a/reels/jock_wilsons_ball/full.ly
+++ b/reels/jock_wilsons_ball/full.ly
@@ -42,8 +42,8 @@
 			\set PipeBandDrumStaff.instrumentName = \markup \column {\instrumentSide}
 			\set PipeBandDrumStaff.shortInstrumentName = \markup{\shortInstrumentSide}
 
-				\snareA
-				\snareB
+				\sideA 
+				\sideB
 		}
 		\new PipeBandDrumStaff = "tenor" {
 			\tenorglobal
diff --git a/reels/jock_wilsons_ball/notes.side.ily b/reels/jock_wilsons_ball/notes.side.ily
index c660bc8..c87d3e8 100644
--- a/reels/jock_wilsons_ball/notes.side.ily
+++ b/reels/jock_wilsons_ball/notes.side.ily
@@ -1,63 +1,82 @@
 % 2/2 Jock Wilson's Ball
 % Side
 \version "2.18.2"
-composerSide = "E.T. de Boone, v0.5, 2023"% 2023-07-14 Andre Rieu, Maastricht
-arrangerSide = ""
+composerSide = "E.T. de Boone, 2016"
 sideglobal = {
-%	\eighthReelBeaming
+	\eighthReelBeaming
 }
 % Music
-snareAA = \drummode {
-	\flam d4 g4:32( d4:32)(-> g4) |
-	\flam \triplet { d8-> g \flam d8 } \flam g8. d16\v	%g8.[ \drag d16 d4 |
+sideAAmain = \drummode {
+		\flam g8. g16
+	d8.:32(  d16)->	g8. g16 
+	|
+	\flam d8. [ \drag g16	d32 g d g d8 ]
+	g8. [ \drag d16		d8. g16 ]
+	|
 }
-snareABA = \drummode {
-	g8.[ \drag d16] d4 |
-	\flam g8. d16:64( d8.) g16	d4:32( d4) |
-	g8.[ d16-> g8. \drag d16]	d16 g d g d16-> g d g->
+sideAAA = \drummode {
+	g16 |
+	\flam d4 \sideAAmain
 }
-snareABB = \drummode {
-	g8.[ \drag d16 d8. g16] |
-	%d16 d g d g8.-> g16	d4:32( d8.) d16:64(\> |
-	%d4)\! \flam d8.\v g16	d8. \flam g16-> \triplet { d8 g8 d8 } |
-	d16 d g d g8.-> g16	d4:32( d8.) d16:64( |
-	d4) \flam d8.\v g16	d8. \flam g16-> d4 | % \triplet { d8 g8 d8 } |
+sideABA = \drummode {
+	d4) \sideAAmain
+}
+sideAAB = \drummode {
+	\flam d8. [ \drag g16	d32 g d g d8 ]
+	g8.:32->([  d16)	g8. g16 ]
+	|
+	\triplet {d8 [  d g } d16 g32 g d8 ]
+	g32 [ d g d g8-> d8. d16:64( ]
+	|
 }
 
-snareA = \drummode {
-	\repeat volta 2 {
-	  \snareAA
-	  \alternative{
-		\snareABA
-		\snareABB
-	  }
-	}
+sideABB = \drummode {
+	\flam d32[  d g8.		d16 g8. ]
+	d4:32(	 d8.) g16
+	|
+	\triplet {d8[  g d }	\flam g8. \drag g16 ]
+	d32 [ g d g d8	g8. ]
+}
+sideA = \drummode {
+	\sideAAA
+	\sideAAB
+	\sideABA
+	\sideABB
 }
 
-snareBA = \drummode {
-	g4	\flam d8.\v d16	g8. d16 \triplet { g8 d g } |
-	%\flam \triplet { d8 g \flam d8 }	\flam g8 d32 g d16	%g8.[ \drag d16 d4 |
-	\flam d8.[ d16	\flam g8.  \triplet { d32 g d] }	%g8.[ \drag d16 d4 |
+
+
+
+sideBA = \drummode {
+	g16 |
+	\flam d4  g4:32(
+	d8.:32)(-> g16) \flam d8. g16  
+	|
+	\flamd \triplet { d8[ g \flam d } \flam g8 \triplet { d16 g d ]} 
+	g8.[  \drag d16		d8. g16 ]
+	|
+	\flam d4  g4:32(	
+	d8.:32)(-> g16) \flam d8. g16  
+	|
+	\triplet { d8 [ d g } d16 g32 g d8]
+	g32 [ d g d g8-> d8. d16:64( ]
+	|
 }
-snareBBA = \drummode {
-	g8.[-> \drag d16]% d4 |
-	d4 |
-	d16->\< g d g d16-> g d g		d8.->\! g16 d8. d16:64( |
-	d4) \flam d8.\v g16	d8. \flam g16-> d8. d16 | %\triplet { d8 g8 d8 } |
-}
-snareBBB = \drummode {
-	g8.[-> \drag d16]% d4 |
-	d4 |
-	d2.:32(\<	d8.)\!\v g16 |
-	d8.:32(-> g16) \triplet { d8 g d }	g16 d8.:32(-> g4)->
+sideBB = \drummode {
+	d4)  g4:32(
+	d8.:32()-> g16) \flam d8. g16  
+	|
+	\flam d8.[  \drag g16	d32 g d g d8 ]
+	g8.[  \drag d16		d8. g16 ]
+	|
+	\flam d16[ g8.	d8. g16  ]
+	d4:32(	d8.) g16
+	|
+	d8.:32( g16) d8. g16
+	d16 g8.:32(	d8.)
 }
 
-snareB = \drummode {
-	\repeat volta 2 {
-	  \snareBA
-	  \alternative{
-		\snareBBA
-		\snareBBB
-	  }
-	}
+sideB = \drummode {
+	\sideBA
+	\sideBB
 }
diff --git a/reels/jock_wilsons_ball/notes.side.old.ily b/reels/jock_wilsons_ball/notes.side.old.ily
deleted file mode 100644
index 802c1a2..0000000
--- a/reels/jock_wilsons_ball/notes.side.old.ily
+++ /dev/null
@@ -1,81 +0,0 @@
-% 2/2 Jock Wilson's Ball
-% Side
-\version "2.18.2"
-composerSide = "E.T. de Boone, 2016"
-sideglobal = {
-	\eighthReelBeaming
-}
-% Music
-sideAAmain = \drummode {
-		d8. g16
-	d8.:32(  d16)->	g8. g16 
-	|
-	%\flamdr d8.\fr [ g16	d8. \flam g16 ]
-	\flamdr d8.\fr [ \drag g16	\triplet { d16 g d g d8] }
-	g8. [ \dragdr d16		d8. g16 ] 
-	|
-}
-sideAAA = \drummode {
-	\flam d4 \sideAAmain
-}
-sideABA = \drummode {
-	d4) \sideAAmain
-}
-sideAAB = \drummode {
-	\flam d8. \fr [ \drag g16	\triplet { d16 g d g d8] }
-	g8.:32->([  d16)	g8. g16 ]
-	|
-	\triplet {d8 [  d g } \triplet { d8 g16 g d8 ] }
-	d16 [ g d g d8. d16:64( ]
-	|
-}
-
-sideABB = \drummode {
-	\flam d32[  d g8.		d16 g8. ]
-	d4:32(	 d8.) g16
-	|
-	\triplet {d8[  g d }	\flam g8. \drag g16 ]
-	\triplet { d16 g d g d8] } g4
-}
-sideA = \drummode {
-	\sideAAA
-	\sideAAB
-	\removeWithTag #'tutti \sideABA
-	\sideABB
-}
-
-
-
-
-sideBA = \drummode {
-	\flam d4  g4:32(
-	d8.:32)(-> g16) \flam d8. g16  
-	|
-	\flamd \triplet { d8[ g \flam d } \flam g8 \triplet { d16 g d ]} 
-	g8.[  \drag d16		d8. g16 ]
-	|
-	\flam d4  g4:32(	
-	d8.:32)(-> g16) \flam d8. g16  
-	|
-	\triplet {d8 [  d g } \triplet { d8 g16 g d8 ] }
-	d16 [ g d g d8. d16:64( ]
-	|
-}
-sideBB = \drummode {
-	d4)  g4:32(
-	d8.:32()-> g16) \flam d8. g16  
-	|
-	\flam d8.[  \drag g16	d32 g d g d8 ]
-	g8.[  \drag d16		d8. g16 ]
-	|
-	\flam d16[ g8.	d8. g16  ]
-	d4:32(	d8.) g16
-	|
-	d8.:32( g16) \triplet { d8 g d8 }
-	g16 d8.:32(->	g4)
-}
-
-sideB = \drummode {
-	\sideBA
-	\sideBB
-}
diff --git a/reels/jock_wilsons_ball/side.ly b/reels/jock_wilsons_ball/side.ly
index 046a46a..0105a61 100644
--- a/reels/jock_wilsons_ball/side.ly
+++ b/reels/jock_wilsons_ball/side.ly
@@ -1,4 +1,4 @@
-\version "2.24.2"
+\version "2.18.2"
 
 \include "lilydrum.ly"
 
@@ -8,20 +8,33 @@
 \score {
     \new PipeBandDrumStaff {
         \global
-			\unfoldRepeats \new DrumVoice = "side" {
-				\sideglobal
-				\snareA
+	\sideglobal
+		<<
+			{ 
+				\partial 16 s16
+				\halfline
 				\break
-				\section
-				\snareB
-				\fine
+				\halfline
+				\bar "|."
+
+				\break
+				\partial 16 s16
+				\halfline
+				\break
+				\halfline
+				\bar "|."
+			}%Format
+			{
+			\sideA s16
+
+			\sideB
 			}
+		>>
 	}
 	\header {
 		title = \title
 		meter = \meter
 		instrument = \instrumentSide
 		composer = \composerSide
-		arranger = \arrangerSide
 	}
 }
diff --git a/reels/piper_of_drummond/notes.side.ily b/reels/piper_of_drummond/notes.side.ily
index a57bcbc..6c28471 100644
--- a/reels/piper_of_drummond/notes.side.ily
+++ b/reels/piper_of_drummond/notes.side.ily
@@ -1,11 +1,15 @@
 % 2/2 Piper of Drummond
 % Side
 \version "2.18.2"
-composerSide = "E.T. de Boone, v0.5, 2023" % 2023-05-05 Wageningen
+composerSide = "E.T. de Boone, v0, 2023" % 2023-05-05
 arrangerSide = ""
 sideglobal = {
+	\eighthReelBeaming
 }
 % Music
+snareA = \drummode {
+}
+
 snareAA = \drummode {
 	\flam d4-> d8. g16
 	d4:32( g8.) d16:64(
@@ -23,13 +27,13 @@ snareABA = \drummode {
 }
 
 snareABB = \drummode {
-	g8. g16 \flam d4
+	g8. g16 \flam d8.-> g16
 	|
 	d4:32( d8.) g16
 	\flam d8. g16 d4:32(\<
 	|
 	d8.)->\! g16 d8. \flam g16
-	d4 d16 g d g
+	d8. g16 d16 g d g
 	|
 }
 
@@ -37,8 +41,8 @@ snareBA = \drummode {
 	d4:32(-> g8.) g16
 	d4:32(\< \triplet { g8)\!\staccato d g }
 	|
-	d8.-> g16 d8. g16:64(->
-	d8.:32 d16) g8. g16
+	d8.-> g16 d8. g16:64(
+	d8.:32 d16)-> g8. g16
 	|
 }
 snareBBA = \drummode {
@@ -50,29 +54,9 @@ snareBBA = \drummode {
 	|
 }
 snareBBB = \drummode {
-	\flam d8.\v g16 d8. \flam g16
+	\flam d8.-> g16 d8. \flam g16
 	d8. g16 \flam d8.\staccato g16
 	|
 	\flam d8.-> g16 \triplet { d8 d \flam g }
 	\triplet { d8 g g } d4\staccato
 }
-
-snareA = \drummode {
-	\repeat volta 2 {
-		\snareAA
-		\alternative {
-			\snareABA
-			\snareABB
-		}
-	}
-}
-
-snareB = \drummode {
-	\repeat volta 2 {
-		\snareBA
-		\alternative {
-			\snareBBA
-			\snareBBB
-		}
-	}
-}