@@ -108,22 +108,24 @@
                 "lead_instr": {  # Instrument 'melody'
                     "score_line": "i1 %(time)f %(duration)f 7000 %(octave)d.%(note)s %(octave)d.%(note)s 0 6",
                     "octave": 8,
                     "duration": 30,
                     "grammars": {  # Notes for this instrument to use in this piece
-                        "u": ["D/4 D/4 D/4 D/4 (v)"],
-                        "v": ["C/4 C/4 C/4 C/4 (u)"],
+                        "u": ["A/4, B/4, C/4 D/4 (u)", "D/4' D/4' D/4' D/4' (v)"],
+                        "v": ["C/4 C/4 C/4 C/4 (w)"],
+                        "w": ["E/4 F/4 E/4 F/4 (u)"],
                     },
                 },
                 "follow_instr": {  # Instrument 'melody'
-                    "score_line": "i2 %(time)f %(duration)f 7000 %(octave)d.%(note)s 1",
-                    "sync": "lead_instr",
-                    "octave": 8,
+                    "score_line": "i3 %(time)f %(duration)f 7000 %(octave)d.%(note)s",
+#                    "sync": "lead_instr",
+                    "octave": 2,
                     "duration": 30,
                     "grammars": {  # Notes for this instrument to use in this piece
-                        "u": ["D/4 D/4 D/4 D/4 (u)"],
-                        "v": ["C/4 C/4 C/4 C/4 (v)"],
+                        "u": ["E F G E (u)"],
+                        "v": ["G A A A (e)"],
+                        "e": ["B' A' G' A' (v)"],
                     },
                 },
             },
         },
     }
@@ -171,11 +173,11 @@
 
 
 def render_instr(instr, syncs, max_time):
     for g in instr["grammars"]:
         for i in range(len(instr["grammars"][g])):
-            instr["grammars"][g][i] = parse.parse(instr["grammars"][g][i])
+            instr["grammars"][g][i] = parse.parse(instr["grammars"][g][i], default_octave=instr["octave"])
 
     score= []
     try:
         score, syncs = choose_phrase(instr, syncs, 0, max_time, None)