diff --git a/strathspeys/orange_and_blue/notes.tenor.ily b/strathspeys/orange_and_blue/notes.tenor.ily
index d1e8073..f454a6c 100644
--- a/strathspeys/orange_and_blue/notes.tenor.ily
+++ b/strathspeys/orange_and_blue/notes.tenor.ily
@@ -1,34 +1,40 @@
 % 4/4 Orange and Blue
 % Tenor
 \version "2.18.2"
-composerTenor = "E.T. de Boone, v0.1, Oct 2022"
+composerTenor = "E.T. de Boone, v0.2, Oct 2022"
 arrangerTenor = ""
 tenorglobal = {}
 % Music
+tenorMid = \drummode {
+	d8. g16 d8. d16 g4 g4 |
+}
+tenorEnd = \drummode {
+	d8. g16 d4 \triplet { d8 g d } g4  |
+	d4^\up g4^\up \stf d2
+}
+
 tenorAA = \drummode {
 	d4 g4 d8. d16 g4 |
 	\flourish { d4 g } r8.^\rpush g16 d4 |
 	d4 g8. g16 d4 g4 |
-	d8. g16 d8. d16 g4 g4 |
+	\tenorMid
 }
 tenorAB = \drummode {
 	d4 g4 d8. d16 g4 |
 	\flourish { d4 g } r8.^\rpush g16 d4 |
-	d8. g16 d4 \triplet { d8 g d } g4  |
-	d4^\up g4^\up \stf d2
+	\tenorEnd
 }
 
 tenorBA = \drummode {
-	\flourish { d4 g4 d4 g4 } |
+	\flourish { d4 d4 g4 g4 } |
 	\triplet { d8 g d } g8. g16 d2 |
-	d4^\up g4^\up d4^\up g4^\up |
-	d8. g16 d8. d16 g4 g4 |
+	\flourish { d4 d4 g4 g4 } |
+	\tenorMid
 }
 tenorBB = \drummode {
-	\flourish { d4 g4 d4 g4 } |
+	d4^\up g4^\up d4^\up g4^\up |
 	\triplet { d8 g d } g8. g16 d2 |
-	d8. g16 d4 \triplet { d8 g d } g4  |
-	d4^\up g4^\up \stf d2
+	\tenorEnd
 }
 
 tenorA = \drummode { \tenorAA \tenorAB }
diff --git a/strathspeys/orange_and_blue/tenor.ly b/strathspeys/orange_and_blue/tenor.ly
index bb51037..1f11b13 100644
--- a/strathspeys/orange_and_blue/tenor.ly
+++ b/strathspeys/orange_and_blue/tenor.ly
@@ -10,13 +10,15 @@
 		\global
 		<<
 			\new NullVoice = "format" {
-				\repeat volta 2 {
+				\repeat volta 1 {
 					\line
 				}
+				\bar "||"
 				\break
-				\repeat volta 2 {
+				\repeat volta 1 {
 					\line
 				}
+				\bar "|."
 			}%Format
 			\new DrumVoice = "tenor" {
 				\tenorglobal