diff --git a/Eybler_SperateInDeo_HV41_Music_AdditionalMeasures.ly b/Eybler_SperateInDeo_HV41_Music_AdditionalMeasures.ly
index 268a4c99efc8a43d869a40601b586905dc5dcd37..c3d4b1e8cc82cb998c7d83f16e56559dca9a8681 100644
--- a/Eybler_SperateInDeo_HV41_Music_AdditionalMeasures.ly
+++ b/Eybler_SperateInDeo_HV41_Music_AdditionalMeasures.ly
@@ -53,16 +53,17 @@ AdditionalMeasuresKey = \key c \major
 AdditionalMeasuresTimeSignature = \time 2/2
 
 AdditionalMeasuresSettings = \notemode {
-  \set Score.currentBarNumber = #79
+%   \set Score.currentBarNumber = #79
 }
 
 
 AdditionalMeasuresObMusic = \relative c'' {
+  \set Score.currentBarNumber = #79
   << {\voiceOne h2 a \oneVoice } \new Voice { \voiceTwo R1 } >> | \barNumberCheck #80
   << {\voiceOne gis 1| a \oneVoice} \new Voice { \voiceTwo h1 | c } >> | % 82
   <h gis>1 | % 83
   <c a>1 | % 84
-  <h gis>4 r8 <h gis> <h gis>4 <h gis>4 | % 85
+  <h gis>4 r8 <h gis> <h gis>4 <h gis>4 | \barNumberCheck #85
 }
 
 AdditionalMeasuresObIMusic = \relative c'' {
@@ -71,7 +72,7 @@ AdditionalMeasuresObIMusic = \relative c'' {
   a | % 82
   h1 | % 83
   c1 | % 84
-  h4 r8 h h4 h4 | % 85
+  h4 r8 h h4 h4 | \barNumberCheck #85
 }
 
 
@@ -81,7 +82,7 @@ AdditionalMeasuresObIIMusic = \relative c'' {
   c | % 82
   gis | % 83
   a | % 84
-  gis4 r8 gis gis4 gis |
+  gis4 r8 gis gis4 gis | \barNumberCheck #85
 }
 
 AdditionalMeasuresFagIMusic = \relative c {
@@ -90,7 +91,7 @@ AdditionalMeasuresFagIMusic = \relative c {
   c2 a | % 82
   e'1 | % 83
   c2 a | % 84
-  e'4 r8 e, e4 e | % 85
+  e'4 r8 e, e4 e | \barNumberCheck #85
 }
 
 AdditionalMeasuresFagIIMusic = \relative c {
@@ -99,7 +100,7 @@ AdditionalMeasuresFagIIMusic = \relative c {
   c2 a | % 82
   e'1 | % 83
   c2 a | % 84
-  e'4 r8 e, e4 e | % 85
+  e'4 r8 e, e4 e | \barNumberCheck #85
 }
 
 
@@ -109,7 +110,7 @@ AdditionalMeasuresTrbIMusic = \relative c' {
   a |
   gis1 |
   a |
-  gis4 r8 e e4 e |
+  gis4 r8 e e4 e | \barNumberCheck #85
 }
 
 AdditionalMeasuresTrbIIMusic = \relative c' {
@@ -118,7 +119,7 @@ AdditionalMeasuresTrbIIMusic = \relative c' {
   c |
   h |
   c |
-  h4 r8 e,8 e4 e |
+  h4 r8 e,8 e4 e | \barNumberCheck #85
 }
 
 AdditionalMeasuresVIMusic = \relative c' {
@@ -127,7 +128,7 @@ AdditionalMeasuresVIMusic = \relative c' {
   a c4 e c a8 | % 82
   gis8 h4 e gis h8 | % 83
   a, c4 e a c8 | % 84
-  h[ e h gis] e[ e h gis] |
+  h[ e h gis] e[ e h gis] | \barNumberCheck #85
 }
 
 AdditionalMeasuresVIIMusic = \relative c' {
@@ -136,7 +137,7 @@ AdditionalMeasuresVIIMusic = \relative c' {
   e e'4 c a e8~ | % 82
   e8 gis4 h e e,8~ | % 83
   e a4 c e a8 | % 84
-  gis[ e h' gis] e[ e h gis] |
+  gis[ e h' gis] e[ e h gis] | \barNumberCheck #85
 }
 
 AdditionalMeasuresVaMusic = \relative c' {
@@ -145,17 +146,17 @@ AdditionalMeasuresVaMusic = \relative c' {
   a a' e c | % 82
   e e gis e | % 83
   a e a c | % 84
-  e8[ e h gis] e[ e h gis] |
+  e8[ e h gis] e[ e h gis] | \barNumberCheck #85
 }
 
 
 AdditionalMeasuresSMusic = \relative c'' {
-  h2 a |
-  e'1~ |
-  e~ |
-  e~ |
-  e |
-  e,2 r |
+  h2 a | \barNumberCheck #80
+  e'1~ | % 81
+  e~ | % 82
+  e~ | % 83
+  e | % 84
+  e,2 r | \barNumberCheck #85
 }
 
 AdditionalMeasuresSLyrics = \lyricmode {
@@ -163,34 +164,34 @@ AdditionalMeasuresSLyrics = \lyricmode {
 }
 
 AdditionalMeasuresAMusic = \relative c' {
-  f2 c |
-  e1~ |
-  e~ |
-  e~ |
-  e |
-  e2 r |
+  f2 c | \barNumberCheck #80
+  e1~ | % 81
+  e~ | % 82
+  e~ | % 83
+  e | % 84
+  e2 r | \barNumberCheck #85
 }
 
 AdditionalMeasuresALyrics = \AdditionalMeasuresSLyrics
 
 AdditionalMeasuresTMusic = \relative c' {
-  d2 dis |
-  e1~ |
-  e~ |
-  e~ |
-  e |
-  e,2 r |
+  d2 dis | \barNumberCheck #80
+  e1~ | % 81
+  e~ | % 82
+  e~ | % 83
+  e | % 84
+  e,2 r | \barNumberCheck #85
 }
 
 AdditionalMeasuresTLyrics = \AdditionalMeasuresSLyrics
 
 AdditionalMeasuresBMusic = \relative c {
-  d2 f |
-  e1~ |
-  e~ |
-  e~ |
-  e |
-  e2 r |
+  d2 f | \barNumberCheck #80
+  e1~ | % 81
+  e~ | % 82
+  e~ | % 83
+  e | % 84
+  e2 r | \barNumberCheck #85
 }
 
 AdditionalMeasuresBLyrics = \AdditionalMeasuresSLyrics
@@ -198,23 +199,23 @@ AdditionalMeasuresBLyrics = \AdditionalMeasuresSLyrics
 
 AdditionalMeasuresVcBMusic = \relative c {
   \bassFigureExtendersOn
-  d,4 d' f, f' |
-  e,4 e' d e |
-  c e a c |
-  e, e'd e |
-  c e c a |
-  e' r r8 e8[-| h-| gis]-| |
+  d,4 d' f, f' | \barNumberCheck #80
+  e,4 e' d e | % 81
+  c e a c | % 82
+  e, e'd e | % 83
+  c e c a | % 84
+  e' r r8 e8[-| h-| gis]-| | \barNumberCheck #85
 }
 
 AdditionalMeasuresBCMusic = \AdditionalMeasuresVcBMusic
 
 AdditionalMeasuresBCFbMusic = \figuremode {
-  <6>2 <6\\>2 |
-  <_+>4 <_+> <_+> <_+> |
-  <6> s s s |
-  <_+> s s s |
-  <6> s s s |
-  <_+> s s s |
+  <6>2 <6\\>2 | \barNumberCheck #80
+  <_+>4 <_+> <_+> <_+> | % 81
+  <6> s s s | % 82
+  <_+> s s s | % 83
+  <6> s s s | % 84
+  <_+> s s s | \barNumberCheck #85
 }
 
 #(oly:modify_score_structure '("Ob" "Staff" ()))