diff --git a/.gitignore b/.gitignore
index eb7198c28c8e15a267ea65ae8a850e1e800648c2..262ea9c8f90792a8fd0cdb4dc34038ffaa5b074f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.log
 *.out
 
+*~
diff --git a/Eybler_EcceQuomodo_HVdeest_Music_EcceQuomodo.ily b/Eybler_EcceQuomodo_HVdeest_Music_EcceQuomodo.ily
index fc5250a2eafa161c346f2d44c7782e27619a54dd..ba870a01b9d97ec6f271e5efb6b31473549d9900 100644
--- a/Eybler_EcceQuomodo_HVdeest_Music_EcceQuomodo.ily
+++ b/Eybler_EcceQuomodo_HVdeest_Music_EcceQuomodo.ily
@@ -3,6 +3,9 @@
 EcceQuomodoKey = \key c \minor
 EcceQuomodoTimeSignature = \time 2/2
 
+setlong = \override Score.SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 16)
+resetlong = \revert Score.SpacingSpanner #'bas-shortest-duration
+
 EcceQuomodoSettings = \notemode {
   \override Staff.NoteHead  #'style = #'baroque
   \set Score.tempoHideNote = ##t
@@ -11,10 +14,16 @@ EcceQuomodoSettings = \notemode {
 
 EcceQuomodoSettingsII = \notemode {
   \bar"||" \barNumberCheck #41
-  \time 2/2 
+  \time 2/2 \newSpacingSection
   \tempo "più adagio"
 }
 
+spacervoice = {} %{\new Voice { \voiceFour
+        \override NoteHead  #'transparent = ##t
+        \override Stem  #'transparent = ##t
+        \override Beam  #'transparent = ##t
+        s2 g4
+    }%}
 
 EcceQuomodoSMusic = \relative c' {
   f1~ | % 2
@@ -55,11 +64,13 @@ EcceQuomodoSMusic = \relative c' {
   g2 g | % 37
   f1~ | % 38
   f | % 39
-  e\breve\fermata \bar"||"\break \barNumberCheck #41
-  \time 2/2
-  \tempo "più adagio" 
-  << {\once\override Score.NonMusicalPaperColumn #'padding = #10 g1} { \once\override Score.NonMusicalPaperColumn #'padding = #10 s2\p \once\override Score.NonMusicalPaperColumn #'padding = #10 s\f} >> | % 42
-  << {as!1} {s2\p s\f} >> | % 43
+  e\breve\fermata \break
+  \EcceQuomodoSettingsII
+  \override Score.SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 16)
+%   \setlong
+  << { g1} { s2\p s\f} \spacervoice>> | % 42
+  << {as!1} {s2\p s\f} \spacervoice >> | % 43
+  \resetlong
   as2 g | % 44
   f1~\p | % 45
   f\f | % 46
@@ -72,7 +83,7 @@ EcceQuomodoSMusic = \relative c' {
   f1~ | % 53
   f e) | % 54
   \once\override Score.NonMusicalPaperColumn #'padding = #10 
-  << {f\breve\fermata} {s2\p s4\f} >>\bar "|."
+  << {f\breve\fermata} {s2\p s4\f} \spacervoice >>\bar "|."
 }
 \addQuote "EcceQuomodoSMusic" { \EcceQuomodoSMusic }
 
@@ -126,23 +137,24 @@ EcceQuomodoAMusic = \relative c' {
   e2 c | % 36
   c1( | % 37
   b) | % 38
-  c\breve\fermata \bar"||"  \barNumberCheck #41
-  \tempo "più adagio" \time 2/2
-  << {e1} {s2\p s\f} >> | % 42
-  << {f1} {s2\p s\f} >> | % 43
+  c\breve\fermata 
+  \EcceQuomodoSettingsII
+  \override Score.SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 16)
+  << {e1} {s2\p s\f}  \spacervoice >> | % 42
+  << {f1} {s2\p s\f}  \spacervoice >> | % 43
   f2 e | % 44
   f1(\p | % 45
   des)\f | % 46
   c1~\p | % 47
   c\f | % 48
-  r2 c | % 49
+  r2 c\pp | % 49
   des1 | \barNumberCheck #50
   des2 des | % 51
   c1~ | % 52
   c~ | % 53
   c~ | % 54
   c | % 55
-  << {c\breve\fermata} {s2\p s4\f} >>\bar "|."
+  << {c\breve\fermata} {s2\p s4\f}  \spacervoice >>\bar "|."
 }
 \addQuote "EcceQuomodoAMusic" { \EcceQuomodoAMusic }
 
@@ -187,23 +199,24 @@ EcceQuomodoTMusic = \relative c' {
   c2 c | % 37
   as!1( | % 38
   g2 f) | % 39
-  g\breve\fermata \bar"||" \barNumberCheck #41
-  \tempo "più adagio" \time 2/2
-  << {c1} {s2\p s\f} >> | % 42
-  << {c1} {s2\p s\f} >> | % 43
+  g\breve\fermata 
+  \EcceQuomodoSettingsII
+  \override Score.SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 16)
+  << {c1} {s2\p s\f}  \spacervoice >> | % 42
+  << {c1} {s2\p s\f}  \spacervoice >> | % 43
   c2 c | % 44
   as1~\p | % 45
   as\f | % 46
   as~\p | % 47
   as\f | % 48
-  r2 as | % 49
+  r2 as\pp | % 49
   as1 | \barNumberCheck #50
   b2 b | % 51
   b1( | % 52
   as! | % 53
   g1~ | % 54
   g) | % 55
-  << {a\breve\fermata} {s2\p s4\f} >>\bar "|."
+  << {a\breve\fermata} {s2\p s4\f}  \spacervoice >>\bar "|."
 }
 \addQuote "EcceQuomodoTMusic" { \EcceQuomodoTMusic }
 
@@ -248,10 +261,11 @@ EcceQuomodoBMusic = \relative c {
   c2 c | % 37
   des1~ | % 38
   des | % 39
-  c\breve\fermata \bar"||" \barNumberCheck #41
-  \time 2/2 \tempo "più adagio"
-  << {c1} {s2\p s\f} >> | % 42
-  << {f1} {s2\p s\f} >> | % 43
+  c\breve\fermata 
+  \EcceQuomodoSettingsII
+  \override Score.SpacingSpanner #'base-shortest-duration = #(ly:make-moment 1 16)
+  << {c1} {s2\p s\f}  \spacervoice >> | % 42
+  << {f1} {s2\p s\f}  \spacervoice >> | % 43
   f2 c | % 44
   des1~\p | % 45
   des\f | % 46
@@ -264,7 +278,7 @@ EcceQuomodoBMusic = \relative c {
   c~ | % 53
   c~ | % 54
   c | % 55
-  << {f,\breve\fermata} {s2\p s4\f} >>\bar "|."
+  << {f,\breve\fermata} {s2\p s4\f}  \spacervoice >>\bar "|."
 }
 \addQuote "EcceQuomodoBMusic" { \EcceQuomodoBMusic }
 
diff --git a/Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.ly b/Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.ly
index 02de55f10097f8d6d6acd372fa38d6af8c03059f..ddd86bcdb56e29f3a66da26db9d5b7ee2061bfc2 100644
--- a/Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.ly
+++ b/Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.ly
@@ -11,8 +11,8 @@
   scorenumber = \markup{\scoreNumber \OrganScoreNumber}
 }
 
-EcceQuomodoOIStaff = \new Staff = "EcceQuomodoOIStaff" \with {\remove "New_dynamic_engraver"} 
-  \new Voice = "EcceQuomodoOIVoice" \with {\remove "New_dynamic_engraver"} {
+EcceQuomodoOIStaff = \new Staff = "EcceQuomodoOIStaff" 
+  \new Voice = "EcceQuomodoOIVoice" \with { \remove "New_dynamic_engraver"} {
   \EcceQuomodoSettings
   \EcceQuomodoTimeSignature
   \EcceQuomodoKey
@@ -54,7 +54,6 @@ EcceQuomodoOIStaff = \new Staff = "EcceQuomodoOIStaff" \with {\remove "New_dynam
     { \quoteDuring #"EcceQuomodoTMusic" {s1*18} }
   >>
 }
-% #(oly:modify_score_structure '("OI" "ParallelVoicesStaff" ("S" "A" "T")))
 #(oly:modify_score_structure '("OII" "ParallelVoicesStaff" ("B")))
 
 \createScore #"EcceQuomodo" #'("O")
diff --git a/Eybler_EcceQuomodo_HVdeest_Settings_Global.ily b/Eybler_EcceQuomodo_HVdeest_Settings_Global.ily
index 065e79a4bb2aa9b23c651503a6adade815c20ee0..fb2837fc005c64d022d991deacfc6b292e99cdbf 100644
--- a/Eybler_EcceQuomodo_HVdeest_Settings_Global.ily
+++ b/Eybler_EcceQuomodo_HVdeest_Settings_Global.ily
@@ -7,7 +7,7 @@ scorenumber="EK-1xxx"
 
 \header { 
   title = "Ecce quomodo"
-  subtitle = "Responsorium für den Karfreitag / Responsory for Food Friday"
+  subtitle = "Responsorium für den Karfreitag / Responsory for Good Friday"
   composer = "Unbekannt (Joseph Eybler?, HV deest)"
   copyright = \markup \abs-fontsize #9 \column{
       \line { "2009, Edition Kainhofer, Vienna. Alle Rechte vorbehalten / All rights reserved / Printed in Austria."} 
diff --git a/out/Eybler_EcceQuomodo_HVdeest_Score_Choral.midi b/out/Eybler_EcceQuomodo_HVdeest_Score_Choral.midi
index 3746884bcf5cbd8659380ee7ceb7db19a65cbadb..ae55cdbbcdc17fb093a713b6099d9d7144818b4a 100644
Binary files a/out/Eybler_EcceQuomodo_HVdeest_Score_Choral.midi and b/out/Eybler_EcceQuomodo_HVdeest_Score_Choral.midi differ
diff --git a/out/Eybler_EcceQuomodo_HVdeest_Score_Choral.pdf b/out/Eybler_EcceQuomodo_HVdeest_Score_Choral.pdf
index 230b586df8d3aa46d4eec498b383b8a6795443c8..73275d071094a4dbede1a925eae1d30ffd73f421 100644
Binary files a/out/Eybler_EcceQuomodo_HVdeest_Score_Choral.pdf and b/out/Eybler_EcceQuomodo_HVdeest_Score_Choral.pdf differ
diff --git a/out/Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.midi b/out/Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.midi
index 01a6652bad895456fcfd6d5123a7182cad4a7a10..cefefc87414db37a8a7d1adfc270c5c4e9a2b9c3 100644
Binary files a/out/Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.midi and b/out/Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.midi differ
diff --git a/out/Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.pdf b/out/Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.pdf
index 9f767ad83f49d48f1fadf9f5093fc018a11a4bf7..f0cb1656bc0210dc27efde442bcbacd5c61248e8 100644
Binary files a/out/Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.pdf and b/out/Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.pdf differ
diff --git a/out/Eybler_EcceQuomodo_HVdeest_Score_Original.pdf b/out/Eybler_EcceQuomodo_HVdeest_Score_Original.pdf
index d1e902a543a0bb737a8be4e73955c43fb83ef4ea..00ce1347755057766c28965cb75196aecbd1b8f6 100644
Binary files a/out/Eybler_EcceQuomodo_HVdeest_Score_Original.pdf and b/out/Eybler_EcceQuomodo_HVdeest_Score_Original.pdf differ
diff --git a/out/TeX_Eybler_EcceQuomodo_HVdeest_Score_Choral.pdf b/out/TeX_Eybler_EcceQuomodo_HVdeest_Score_Choral.pdf
index 59ea119c42c7121b06e5ec41b773cde7110ccb9a..8395db6b5e6b2b53383fa01c773b67b3a839fa6d 100644
Binary files a/out/TeX_Eybler_EcceQuomodo_HVdeest_Score_Choral.pdf and b/out/TeX_Eybler_EcceQuomodo_HVdeest_Score_Choral.pdf differ
diff --git a/out/TeX_Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.pdf b/out/TeX_Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.pdf
index 25aaeb7b78e8e2497fdb6527305874451690b07d..e980e64400a2154ec2250418acc4edf30cc3b839 100644
Binary files a/out/TeX_Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.pdf and b/out/TeX_Eybler_EcceQuomodo_HVdeest_Score_Klavierauszug.pdf differ