diff --git a/3-4_marches/jim_thomson_of_flagstaff/config.ily b/3-4_marches/jim_thomson_of_flagstaff/config.ily
index a8a75b4..46c37bf 100644
--- a/3-4_marches/jim_thomson_of_flagstaff/config.ily
+++ b/3-4_marches/jim_thomson_of_flagstaff/config.ily
@@ -7,7 +7,7 @@ confTempo = {
 	\tempo 4 = 80 
 	}
 %% Format
-part = { \partial 8 s8 }
+part = { \partial 8 \grace { s4 } s8 }
 measure = { \grace {s1} s4*3 | }
 halfline = { \repeat unfold 4 \measure }
 line = { \repeat unfold 2 { \halfline } }
diff --git a/3-4_marches/jim_thomson_of_flagstaff/notes.pipes.ily b/3-4_marches/jim_thomson_of_flagstaff/notes.pipes.ily
index d838c20..8085ff4 100644
--- a/3-4_marches/jim_thomson_of_flagstaff/notes.pipes.ily
+++ b/3-4_marches/jim_thomson_of_flagstaff/notes.pipes.ily
@@ -7,28 +7,34 @@ pipeglobal = {
 	\key a \mixolydian
 }
 % Music
-pipesA = {
+pipesAAA = {
  \grg a8. [ b16 ] \grip c4 \dblc c8 [ a8 ] |
  \dblb b8 [ a8 ] \grg f4 \gre f4 |
  \dblA A8. [ f16 ] \grg e4 e8 [ f8 ] |
  \dble e8. [ c16 ] \dblb b2 |
-
+}
+pipesAAB = {
  \grg a8. [ b16 ] \grip c4 \dblc c8 [ a8 ] |
  \dblb b8 [ a8 ] \grg f4 \gre f4 |
  \grg e8. [ f16 ] \dble e4 e8 [ c8 ] |
 }
+
+pipesA = {
+	\pipesAAA
+	\pipesAAB
+}
 pipesABA = {
  \dblb b8.  \grG a16  \grg a2
 }
 pipesABB = {
- \dblb b8.  \grG a16  a4. \wbirl a8
+ \dblb b8.  \grG a16  a4.
 }
 
 pipesBA = {
+ \wbirl a8 |
  \grg \tuplet 3/2 { b8 [ c8 e8 ] } \grg f4 \grg f8 [ e8 ] |
  \dblA A8. [ e16 ] \grg c4 \grip c4 |
  \dblA A8. [ f16 ] \grg e4 e8 [ f8 ] |
- \dble e8. [ c16 ] \dblb b4. \grG a8  |
 }
 pipesBBA = {
  \dble e8. [ c16 ] \dblb b4. \grG a8 |
@@ -36,13 +42,11 @@ pipesBBA = {
  \grg \tuplet 3/2 { b8 [ c8 e8 ] } \grg f4 \grg f8 [ e8 ] |
  \dblA A8. [ e16 ] \grg c4 \grip c4 |
  \dblA A8. [ f16 ] \grg e4 e8 [ c8 ] |
- \dblb b8. [ \grG a16 ] a4. \wbirl a8 |
+ \dblb b8. [ \grG a16 ] a4.
 }
 pipesBBB = {
  \dble e8. [ c16 ] \dblb b2 |
 
- \grg a8. [ b16 ] \grip c4 \dblc c8 [ a8 ] |
- \dblb b8 [ a8 ] \grg f4 \gre f4 |
- \grg e8. [ f16 ] \dble e4 e8 [ c8 ] |
- \dblb b8. [ \grG a16. ] a4. \wbirl a8
+ \pipesAAB
+ \pipesABB
 }
diff --git a/3-4_marches/jim_thomson_of_flagstaff/pipes.ly b/3-4_marches/jim_thomson_of_flagstaff/pipes.ly
index dee7241..23688b8 100644
--- a/3-4_marches/jim_thomson_of_flagstaff/pipes.ly
+++ b/3-4_marches/jim_thomson_of_flagstaff/pipes.ly
@@ -22,7 +22,10 @@
 				\break
 
 				\repeat volta 2 {
-					\halfline
+					\part |
+					\measure |
+					\measure |
+					\measure |
 				}\alternative{
 					{
 					  \measure
@@ -39,10 +42,10 @@
 			\new Voice = "pipes" {
 				\pipesA
 				\pipesABA
-				\pipesABB
+				\pipesABB s8
 
 				\pipesBA
-				\pipesBBA
+				\pipesBBA s8
 				\pipesBBB
 			}
 		>>
@@ -64,7 +67,6 @@
 		\pipesBA \pipesBBA
 		\pipesBA \pipesBBB
 
-
 	}
 	\midi { \confTempo }
 	\header {