diff --git a/layouts/Makefile b/layouts/Makefile
index 8a97f31e..ea186018 100644
--- a/layouts/Makefile
+++ b/layouts/Makefile
@@ -2,10 +2,10 @@
 all: small_core.alf medium_core.alf big_core.alf
 
 %_core.alf:
-	@echo "Generating pipeout for $@d"
+	@echo "Generating pipeout for $@"
 	@(cd ../release; ./olympia -z ../layouts/pipeout -i1 traces/dhry_riscv.zstf > /dev/null)
 	@./gen_alf.py -d pipeoutlocation.dat -a $*_core.alf
 	@rm pipeout*
 
 clean:
-	rm *.alf pipeout*
+	rm -f *.alf pipeout*
diff --git a/layouts/big_core.alf b/layouts/big_core.alf
index 1f5f293b..f579e9b0 100644
--- a/layouts/big_core.alf
+++ b/layouts/big_core.alf
@@ -1,7 +1,7 @@
 ---
 - type: schedule
   color:        (192,192,192)
-  dimensions:   (720,1456)
+  dimensions:   (720,1568)
   position:     (159,2)
   pixel_offset: 80
   time_scale:   0.125
@@ -475,262 +475,318 @@
     LocationString:  top.cpu.core0.lsu.lsu_inst_queue.lsu_inst_queue0
     t_offset:   -10
     type:           schedule_line
-  - Content: auto_color_annotation
+  - Content: auto_color_anno_notext
     color:      (192,192,192)
-    dimensions: (720,15)
+    dimensions: (720,5)
     position:   (159,527)
-    LocationString:  top.cpu.core0.lsu.dcache_busy
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer7
     t_offset:   -10
     type:           schedule_line
-  - Content: auto_color_annotation
+  - Content: auto_color_anno_notext
     color:      (192,192,192)
-    dimensions: (720,15)
+    dimensions: (720,5)
+    position:   (159,532)
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer6
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_anno_notext
+    color:      (192,192,192)
+    dimensions: (720,5)
+    position:   (159,537)
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer5
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_anno_notext
+    color:      (192,192,192)
+    dimensions: (720,5)
     position:   (159,542)
-    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline4
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer4
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_anno_notext
+    color:      (192,192,192)
+    dimensions: (720,5)
+    position:   (159,547)
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer3
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_anno_notext
+    color:      (192,192,192)
+    dimensions: (720,5)
+    position:   (159,552)
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer2
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
     position:   (159,557)
-    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline3
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer1
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
     position:   (159,572)
-    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline2
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer0
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
     position:   (159,587)
-    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline1
+    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline0
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
     position:   (159,602)
-    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline0
+    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline1
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_annotation
+    color:      (192,192,192)
+    dimensions: (720,15)
+    position:   (159,617)
+    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline2
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_annotation
+    color:      (192,192,192)
+    dimensions: (720,15)
+    position:   (159,632)
+    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline3
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_annotation
+    color:      (192,192,192)
+    dimensions: (720,15)
+    position:   (159,647)
+    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline4
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_anno_nomunge
+    color:      (192,192,192)
+    dimensions: (720,15)
+    position:   (159,662)
+    LocationString:  top.cpu.core0.lsu.dcache_busy
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,617)
+    position:   (159,677)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer29
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,622)
+    position:   (159,682)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer28
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,627)
+    position:   (159,687)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer27
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,632)
+    position:   (159,692)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer26
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,637)
+    position:   (159,697)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer25
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,642)
+    position:   (159,702)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer24
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,647)
+    position:   (159,707)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer23
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,652)
+    position:   (159,712)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer22
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,657)
+    position:   (159,717)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer21
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,662)
+    position:   (159,722)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer20
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,667)
+    position:   (159,727)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer19
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,672)
+    position:   (159,732)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer18
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,677)
+    position:   (159,737)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer17
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,682)
+    position:   (159,742)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer16
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,687)
+    position:   (159,747)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer15
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,692)
+    position:   (159,752)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer14
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,697)
+    position:   (159,757)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer13
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,702)
+    position:   (159,762)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer12
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,707)
+    position:   (159,767)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer11
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,712)
+    position:   (159,772)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer10
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,717)
+    position:   (159,777)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer9
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,722)
+    position:   (159,782)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer8
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,727)
+    position:   (159,787)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer7
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,732)
+    position:   (159,792)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer6
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,737)
+    position:   (159,797)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer5
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,752)
+    position:   (159,812)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer4
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,767)
+    position:   (159,827)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer3
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,782)
+    position:   (159,842)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer2
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,797)
+    position:   (159,857)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer1
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,812)
+    position:   (159,872)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer0
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_nomunge
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,827)
+    position:   (159,887)
     LocationString:  top.cpu.core0.dispatch.in_reorder_flush
     t_offset:   -10
     type:           schedule_line
@@ -1136,226 +1192,274 @@
   position:   (1049,512)
   LocationString:  top.cpu.core0.lsu.lsu_inst_queue.lsu_inst_queue0
   t_offset:   0
-- Content: auto_color_annotation
+- Content: auto_color_anno_notext
   color:      (192,192,192)
-  dimensions: (150,15)
+  dimensions: (150,5)
   position:   (1049,527)
-  LocationString:  top.cpu.core0.lsu.dcache_busy
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer7
   t_offset:   0
-- Content: auto_color_annotation
+- Content: auto_color_anno_notext
   color:      (192,192,192)
-  dimensions: (150,15)
+  dimensions: (150,5)
+  position:   (1049,532)
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer6
+  t_offset:   0
+- Content: auto_color_anno_notext
+  color:      (192,192,192)
+  dimensions: (150,5)
+  position:   (1049,537)
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer5
+  t_offset:   0
+- Content: auto_color_anno_notext
+  color:      (192,192,192)
+  dimensions: (150,5)
   position:   (1049,542)
-  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline4
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer4
+  t_offset:   0
+- Content: auto_color_anno_notext
+  color:      (192,192,192)
+  dimensions: (150,5)
+  position:   (1049,547)
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer3
+  t_offset:   0
+- Content: auto_color_anno_notext
+  color:      (192,192,192)
+  dimensions: (150,5)
+  position:   (1049,552)
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer2
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (1049,557)
-  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline3
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer1
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (1049,572)
-  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline2
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer0
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (1049,587)
-  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline1
+  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline0
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (1049,602)
-  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline0
+  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline1
+  t_offset:   0
+- Content: auto_color_annotation
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (1049,617)
+  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline2
+  t_offset:   0
+- Content: auto_color_annotation
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (1049,632)
+  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline3
+  t_offset:   0
+- Content: auto_color_annotation
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (1049,647)
+  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline4
+  t_offset:   0
+- Content: auto_color_anno_nomunge
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (1049,662)
+  LocationString:  top.cpu.core0.lsu.dcache_busy
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,617)
+  position:   (1049,677)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer29
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,622)
+  position:   (1049,682)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer28
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,627)
+  position:   (1049,687)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer27
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,632)
+  position:   (1049,692)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer26
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,637)
+  position:   (1049,697)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer25
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,642)
+  position:   (1049,702)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer24
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,647)
+  position:   (1049,707)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer23
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,652)
+  position:   (1049,712)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer22
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,657)
+  position:   (1049,717)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer21
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,662)
+  position:   (1049,722)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer20
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,667)
+  position:   (1049,727)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer19
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,672)
+  position:   (1049,732)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer18
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,677)
+  position:   (1049,737)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer17
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,682)
+  position:   (1049,742)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer16
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,687)
+  position:   (1049,747)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer15
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,692)
+  position:   (1049,752)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer14
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,697)
+  position:   (1049,757)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer13
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,702)
+  position:   (1049,762)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer12
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,707)
+  position:   (1049,767)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer11
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,712)
+  position:   (1049,772)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer10
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,717)
+  position:   (1049,777)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer9
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,722)
+  position:   (1049,782)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer8
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,727)
+  position:   (1049,787)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer7
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,732)
+  position:   (1049,792)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer6
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,737)
+  position:   (1049,797)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer5
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,752)
+  position:   (1049,812)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer4
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,767)
+  position:   (1049,827)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer3
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,782)
+  position:   (1049,842)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer2
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,797)
+  position:   (1049,857)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer1
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,812)
+  position:   (1049,872)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer0
   t_offset:   0
 - Content: auto_color_anno_nomunge
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,827)
+  position:   (1049,887)
   LocationString:  top.cpu.core0.dispatch.in_reorder_flush
   t_offset:   0
 - Content: caption
@@ -1592,272 +1696,302 @@
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (10,467)
-  caption:    LSU IQ
+  caption:    LSU IQ[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,468)
-  caption:    LSU IQ
+  caption:    LSU IQ[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,497)
-  caption:    LSU IQ1
+  caption:    LSU IQ[
]1
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,498)
-  caption:    LSU IQ1
+  caption:    LSU IQ[
]1
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,512)
-  caption:    LSU IQ0
+  caption:    LSU IQ[
]0
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,513)
-  caption:    LSU IQ0
+  caption:    LSU IQ[
]0
 - Content: caption
   color:      (192,192,192)
-  dimensions: (150,15)
+  dimensions: (150,14)
   position:   (10,527)
-  caption:    DL1 busy
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,528)
-  caption:    DL1 busy
-- Content: caption
-  color:      (192,192,192)
-  dimensions: (150,15)
-  position:   (10,542)
-  caption:    LSU Pipe4
-- Content: caption
-  color:      (192,192,192)
-  dimensions: (150,14)
-  position:   (899,543)
-  caption:    LSU Pipe4
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,557)
-  caption:    LSU Pipe3
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,558)
-  caption:    LSU Pipe3
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,572)
-  caption:    LSU Pipe2
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,573)
-  caption:    LSU Pipe2
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,587)
-  caption:    LSU Pipe1
+  caption:    LSU Pipe0
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,588)
-  caption:    LSU Pipe1
+  caption:    LSU Pipe0
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,602)
-  caption:    LSU Pipe0
+  caption:    LSU Pipe1
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,603)
-  caption:    LSU Pipe0
+  caption:    LSU Pipe1
 - Content: caption
   color:      (192,192,192)
-  dimensions: (150,14)
+  dimensions: (150,15)
   position:   (10,617)
-  caption:    ROB[29-6]
+  caption:    LSU Pipe2
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,618)
+  caption:    LSU Pipe2
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (10,632)
+  caption:    LSU Pipe3
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,14)
+  position:   (899,633)
+  caption:    LSU Pipe3
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (10,647)
+  caption:    LSU Pipe4
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,14)
+  position:   (899,648)
+  caption:    LSU Pipe4
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (10,662)
+  caption:    DL1 busy
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,14)
+  position:   (899,663)
+  caption:    DL1 busy
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,14)
+  position:   (10,677)
+  caption:    ROB[29-6]
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,14)
+  position:   (899,678)
   caption:    ROB[29-6]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,737)
+  position:   (10,797)
   caption:    ROB[5]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,738)
+  position:   (899,798)
   caption:    ROB[5]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,752)
+  position:   (10,812)
   caption:    ROB[4]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,753)
+  position:   (899,813)
   caption:    ROB[4]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,767)
+  position:   (10,827)
   caption:    ROB[3]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,768)
+  position:   (899,828)
   caption:    ROB[3]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,782)
+  position:   (10,842)
   caption:    ROB[2]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,783)
+  position:   (899,843)
   caption:    ROB[2]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,797)
+  position:   (10,857)
   caption:    ROB[1]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,798)
+  position:   (899,858)
   caption:    ROB[1]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,812)
+  position:   (10,872)
   caption:    ROB[0]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,813)
+  position:   (899,873)
   caption:    ROB[0]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,827)
+  position:   (10,887)
   caption:    ROB flush
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,828)
+  position:   (899,888)
   caption:    ROB flush
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,842)
+  position:   (10,902)
   caption:    C=1 Cycle
 - Content: cycle
   color:      (192,192,192)
   dimensions: (100,15)
-  position:   (60,842)
+  position:   (60,902)
   LocationString:  .*rob.ReorderBuffer.ReorderBuffer0
   t_offset:   0
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (160,842)
+  position:   (160,902)
   caption:    C=1 -10
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (200,842)
+  position:   (200,902)
   caption:    C=1 -5
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (240,842)
+  position:   (240,902)
   caption:    C=1 0
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (280,842)
+  position:   (280,902)
   caption:    C=1 5
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (320,842)
+  position:   (320,902)
   caption:    C=1 10
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (360,842)
+  position:   (360,902)
   caption:    C=1 15
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (400,842)
+  position:   (400,902)
   caption:    C=1 20
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (440,842)
+  position:   (440,902)
   caption:    C=1 25
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (480,842)
+  position:   (480,902)
   caption:    C=1 30
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (520,842)
+  position:   (520,902)
   caption:    C=1 35
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (560,842)
+  position:   (560,902)
   caption:    C=1 40
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (600,842)
+  position:   (600,902)
   caption:    C=1 45
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (640,842)
+  position:   (640,902)
   caption:    C=1 50
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (680,842)
+  position:   (680,902)
   caption:    C=1 55
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (720,842)
+  position:   (720,902)
   caption:    C=1 60
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (760,842)
+  position:   (760,902)
   caption:    C=1 65
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (800,842)
+  position:   (800,902)
   caption:    C=1 70
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (840,842)
+  position:   (840,902)
   caption:    C=1 75
 - Content: caption
   color:      (0,0,0)
@@ -1897,11 +2031,11 @@
 - Content: caption
   color:      (0,0,0)
   dimensions: (870,1)
-  position:   (10,617)
+  position:   (10,662)
   caption:    
 - Content: caption
   color:      (0,0,0)
   dimensions: (870,1)
-  position:   (10,827)
+  position:   (10,887)
   caption:    
 ...
diff --git a/layouts/gen_alf.py b/layouts/gen_alf.py
index f357f4af..073d9541 100755
--- a/layouts/gen_alf.py
+++ b/layouts/gen_alf.py
@@ -82,9 +82,11 @@
         num += 1
 
 #-------------------------------------------------- LSU
-sl_grp.addScheduleLine('.*lsu.lsu_inst_queue.lsu_inst_queue', ["LSU IQ"], mini_split=[80,20])
-sl_grp.addScheduleLine('.*lsu.dcache_busy', ["DL1 busy"])
-sl_grp.addScheduleLine('.*lsu.LoadStorePipeline.LoadStorePipeline', ["LSU Pipe"], space=True)
+sl_grp.addScheduleLine('.*lsu.lsu_inst_queue.lsu_inst_queue', ["LSU IQ[\1]"], mini_split=[80,20])
+sl_grp.addScheduleLine('.*lsu.replay_buffer.replay_buffer([0-9]+)', ["LSU Replay[\1]"], mini_split=[80,20])
+
+sl_grp.addScheduleLine('.*lsu.LoadStorePipeline.LoadStorePipeline', ["LSU Pipe"], space=True, reverse=False)
+sl_grp.addScheduleLine('.*lsu.dcache_busy', ["DL1 busy"], nomunge=True)
 
 #-------------------------------------------------- Retire
 sl_grp.addScheduleLine('.*rob.ReorderBuffer.ReorderBuffer([0-9]+)', [r"ROB[\1]"], mini_split=[80,20], space=True)
diff --git a/layouts/medium_core.alf b/layouts/medium_core.alf
index 1f5f293b..f579e9b0 100644
--- a/layouts/medium_core.alf
+++ b/layouts/medium_core.alf
@@ -1,7 +1,7 @@
 ---
 - type: schedule
   color:        (192,192,192)
-  dimensions:   (720,1456)
+  dimensions:   (720,1568)
   position:     (159,2)
   pixel_offset: 80
   time_scale:   0.125
@@ -475,262 +475,318 @@
     LocationString:  top.cpu.core0.lsu.lsu_inst_queue.lsu_inst_queue0
     t_offset:   -10
     type:           schedule_line
-  - Content: auto_color_annotation
+  - Content: auto_color_anno_notext
     color:      (192,192,192)
-    dimensions: (720,15)
+    dimensions: (720,5)
     position:   (159,527)
-    LocationString:  top.cpu.core0.lsu.dcache_busy
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer7
     t_offset:   -10
     type:           schedule_line
-  - Content: auto_color_annotation
+  - Content: auto_color_anno_notext
     color:      (192,192,192)
-    dimensions: (720,15)
+    dimensions: (720,5)
+    position:   (159,532)
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer6
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_anno_notext
+    color:      (192,192,192)
+    dimensions: (720,5)
+    position:   (159,537)
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer5
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_anno_notext
+    color:      (192,192,192)
+    dimensions: (720,5)
     position:   (159,542)
-    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline4
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer4
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_anno_notext
+    color:      (192,192,192)
+    dimensions: (720,5)
+    position:   (159,547)
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer3
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_anno_notext
+    color:      (192,192,192)
+    dimensions: (720,5)
+    position:   (159,552)
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer2
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
     position:   (159,557)
-    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline3
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer1
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
     position:   (159,572)
-    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline2
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer0
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
     position:   (159,587)
-    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline1
+    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline0
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
     position:   (159,602)
-    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline0
+    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline1
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_annotation
+    color:      (192,192,192)
+    dimensions: (720,15)
+    position:   (159,617)
+    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline2
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_annotation
+    color:      (192,192,192)
+    dimensions: (720,15)
+    position:   (159,632)
+    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline3
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_annotation
+    color:      (192,192,192)
+    dimensions: (720,15)
+    position:   (159,647)
+    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline4
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_anno_nomunge
+    color:      (192,192,192)
+    dimensions: (720,15)
+    position:   (159,662)
+    LocationString:  top.cpu.core0.lsu.dcache_busy
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,617)
+    position:   (159,677)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer29
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,622)
+    position:   (159,682)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer28
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,627)
+    position:   (159,687)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer27
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,632)
+    position:   (159,692)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer26
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,637)
+    position:   (159,697)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer25
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,642)
+    position:   (159,702)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer24
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,647)
+    position:   (159,707)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer23
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,652)
+    position:   (159,712)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer22
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,657)
+    position:   (159,717)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer21
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,662)
+    position:   (159,722)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer20
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,667)
+    position:   (159,727)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer19
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,672)
+    position:   (159,732)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer18
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,677)
+    position:   (159,737)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer17
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,682)
+    position:   (159,742)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer16
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,687)
+    position:   (159,747)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer15
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,692)
+    position:   (159,752)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer14
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,697)
+    position:   (159,757)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer13
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,702)
+    position:   (159,762)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer12
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,707)
+    position:   (159,767)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer11
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,712)
+    position:   (159,772)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer10
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,717)
+    position:   (159,777)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer9
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,722)
+    position:   (159,782)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer8
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,727)
+    position:   (159,787)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer7
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,732)
+    position:   (159,792)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer6
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,737)
+    position:   (159,797)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer5
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,752)
+    position:   (159,812)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer4
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,767)
+    position:   (159,827)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer3
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,782)
+    position:   (159,842)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer2
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,797)
+    position:   (159,857)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer1
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,812)
+    position:   (159,872)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer0
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_nomunge
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,827)
+    position:   (159,887)
     LocationString:  top.cpu.core0.dispatch.in_reorder_flush
     t_offset:   -10
     type:           schedule_line
@@ -1136,226 +1192,274 @@
   position:   (1049,512)
   LocationString:  top.cpu.core0.lsu.lsu_inst_queue.lsu_inst_queue0
   t_offset:   0
-- Content: auto_color_annotation
+- Content: auto_color_anno_notext
   color:      (192,192,192)
-  dimensions: (150,15)
+  dimensions: (150,5)
   position:   (1049,527)
-  LocationString:  top.cpu.core0.lsu.dcache_busy
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer7
   t_offset:   0
-- Content: auto_color_annotation
+- Content: auto_color_anno_notext
   color:      (192,192,192)
-  dimensions: (150,15)
+  dimensions: (150,5)
+  position:   (1049,532)
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer6
+  t_offset:   0
+- Content: auto_color_anno_notext
+  color:      (192,192,192)
+  dimensions: (150,5)
+  position:   (1049,537)
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer5
+  t_offset:   0
+- Content: auto_color_anno_notext
+  color:      (192,192,192)
+  dimensions: (150,5)
   position:   (1049,542)
-  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline4
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer4
+  t_offset:   0
+- Content: auto_color_anno_notext
+  color:      (192,192,192)
+  dimensions: (150,5)
+  position:   (1049,547)
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer3
+  t_offset:   0
+- Content: auto_color_anno_notext
+  color:      (192,192,192)
+  dimensions: (150,5)
+  position:   (1049,552)
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer2
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (1049,557)
-  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline3
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer1
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (1049,572)
-  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline2
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer0
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (1049,587)
-  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline1
+  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline0
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (1049,602)
-  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline0
+  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline1
+  t_offset:   0
+- Content: auto_color_annotation
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (1049,617)
+  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline2
+  t_offset:   0
+- Content: auto_color_annotation
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (1049,632)
+  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline3
+  t_offset:   0
+- Content: auto_color_annotation
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (1049,647)
+  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline4
+  t_offset:   0
+- Content: auto_color_anno_nomunge
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (1049,662)
+  LocationString:  top.cpu.core0.lsu.dcache_busy
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,617)
+  position:   (1049,677)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer29
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,622)
+  position:   (1049,682)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer28
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,627)
+  position:   (1049,687)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer27
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,632)
+  position:   (1049,692)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer26
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,637)
+  position:   (1049,697)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer25
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,642)
+  position:   (1049,702)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer24
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,647)
+  position:   (1049,707)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer23
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,652)
+  position:   (1049,712)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer22
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,657)
+  position:   (1049,717)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer21
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,662)
+  position:   (1049,722)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer20
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,667)
+  position:   (1049,727)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer19
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,672)
+  position:   (1049,732)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer18
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,677)
+  position:   (1049,737)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer17
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,682)
+  position:   (1049,742)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer16
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,687)
+  position:   (1049,747)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer15
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,692)
+  position:   (1049,752)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer14
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,697)
+  position:   (1049,757)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer13
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,702)
+  position:   (1049,762)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer12
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,707)
+  position:   (1049,767)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer11
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,712)
+  position:   (1049,772)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer10
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,717)
+  position:   (1049,777)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer9
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,722)
+  position:   (1049,782)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer8
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,727)
+  position:   (1049,787)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer7
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,732)
+  position:   (1049,792)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer6
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,737)
+  position:   (1049,797)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer5
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,752)
+  position:   (1049,812)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer4
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,767)
+  position:   (1049,827)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer3
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,782)
+  position:   (1049,842)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer2
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,797)
+  position:   (1049,857)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer1
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,812)
+  position:   (1049,872)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer0
   t_offset:   0
 - Content: auto_color_anno_nomunge
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,827)
+  position:   (1049,887)
   LocationString:  top.cpu.core0.dispatch.in_reorder_flush
   t_offset:   0
 - Content: caption
@@ -1592,272 +1696,302 @@
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (10,467)
-  caption:    LSU IQ
+  caption:    LSU IQ[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,468)
-  caption:    LSU IQ
+  caption:    LSU IQ[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,497)
-  caption:    LSU IQ1
+  caption:    LSU IQ[
]1
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,498)
-  caption:    LSU IQ1
+  caption:    LSU IQ[
]1
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,512)
-  caption:    LSU IQ0
+  caption:    LSU IQ[
]0
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,513)
-  caption:    LSU IQ0
+  caption:    LSU IQ[
]0
 - Content: caption
   color:      (192,192,192)
-  dimensions: (150,15)
+  dimensions: (150,14)
   position:   (10,527)
-  caption:    DL1 busy
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,528)
-  caption:    DL1 busy
-- Content: caption
-  color:      (192,192,192)
-  dimensions: (150,15)
-  position:   (10,542)
-  caption:    LSU Pipe4
-- Content: caption
-  color:      (192,192,192)
-  dimensions: (150,14)
-  position:   (899,543)
-  caption:    LSU Pipe4
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,557)
-  caption:    LSU Pipe3
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,558)
-  caption:    LSU Pipe3
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,572)
-  caption:    LSU Pipe2
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,573)
-  caption:    LSU Pipe2
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,587)
-  caption:    LSU Pipe1
+  caption:    LSU Pipe0
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,588)
-  caption:    LSU Pipe1
+  caption:    LSU Pipe0
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,602)
-  caption:    LSU Pipe0
+  caption:    LSU Pipe1
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,603)
-  caption:    LSU Pipe0
+  caption:    LSU Pipe1
 - Content: caption
   color:      (192,192,192)
-  dimensions: (150,14)
+  dimensions: (150,15)
   position:   (10,617)
-  caption:    ROB[29-6]
+  caption:    LSU Pipe2
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,618)
+  caption:    LSU Pipe2
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (10,632)
+  caption:    LSU Pipe3
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,14)
+  position:   (899,633)
+  caption:    LSU Pipe3
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (10,647)
+  caption:    LSU Pipe4
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,14)
+  position:   (899,648)
+  caption:    LSU Pipe4
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (10,662)
+  caption:    DL1 busy
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,14)
+  position:   (899,663)
+  caption:    DL1 busy
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,14)
+  position:   (10,677)
+  caption:    ROB[29-6]
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,14)
+  position:   (899,678)
   caption:    ROB[29-6]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,737)
+  position:   (10,797)
   caption:    ROB[5]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,738)
+  position:   (899,798)
   caption:    ROB[5]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,752)
+  position:   (10,812)
   caption:    ROB[4]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,753)
+  position:   (899,813)
   caption:    ROB[4]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,767)
+  position:   (10,827)
   caption:    ROB[3]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,768)
+  position:   (899,828)
   caption:    ROB[3]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,782)
+  position:   (10,842)
   caption:    ROB[2]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,783)
+  position:   (899,843)
   caption:    ROB[2]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,797)
+  position:   (10,857)
   caption:    ROB[1]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,798)
+  position:   (899,858)
   caption:    ROB[1]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,812)
+  position:   (10,872)
   caption:    ROB[0]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,813)
+  position:   (899,873)
   caption:    ROB[0]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,827)
+  position:   (10,887)
   caption:    ROB flush
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,828)
+  position:   (899,888)
   caption:    ROB flush
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,842)
+  position:   (10,902)
   caption:    C=1 Cycle
 - Content: cycle
   color:      (192,192,192)
   dimensions: (100,15)
-  position:   (60,842)
+  position:   (60,902)
   LocationString:  .*rob.ReorderBuffer.ReorderBuffer0
   t_offset:   0
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (160,842)
+  position:   (160,902)
   caption:    C=1 -10
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (200,842)
+  position:   (200,902)
   caption:    C=1 -5
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (240,842)
+  position:   (240,902)
   caption:    C=1 0
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (280,842)
+  position:   (280,902)
   caption:    C=1 5
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (320,842)
+  position:   (320,902)
   caption:    C=1 10
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (360,842)
+  position:   (360,902)
   caption:    C=1 15
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (400,842)
+  position:   (400,902)
   caption:    C=1 20
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (440,842)
+  position:   (440,902)
   caption:    C=1 25
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (480,842)
+  position:   (480,902)
   caption:    C=1 30
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (520,842)
+  position:   (520,902)
   caption:    C=1 35
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (560,842)
+  position:   (560,902)
   caption:    C=1 40
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (600,842)
+  position:   (600,902)
   caption:    C=1 45
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (640,842)
+  position:   (640,902)
   caption:    C=1 50
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (680,842)
+  position:   (680,902)
   caption:    C=1 55
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (720,842)
+  position:   (720,902)
   caption:    C=1 60
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (760,842)
+  position:   (760,902)
   caption:    C=1 65
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (800,842)
+  position:   (800,902)
   caption:    C=1 70
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (840,842)
+  position:   (840,902)
   caption:    C=1 75
 - Content: caption
   color:      (0,0,0)
@@ -1897,11 +2031,11 @@
 - Content: caption
   color:      (0,0,0)
   dimensions: (870,1)
-  position:   (10,617)
+  position:   (10,662)
   caption:    
 - Content: caption
   color:      (0,0,0)
   dimensions: (870,1)
-  position:   (10,827)
+  position:   (10,887)
   caption:    
 ...
diff --git a/layouts/small_core.alf b/layouts/small_core.alf
index 1f5f293b..f579e9b0 100644
--- a/layouts/small_core.alf
+++ b/layouts/small_core.alf
@@ -1,7 +1,7 @@
 ---
 - type: schedule
   color:        (192,192,192)
-  dimensions:   (720,1456)
+  dimensions:   (720,1568)
   position:     (159,2)
   pixel_offset: 80
   time_scale:   0.125
@@ -475,262 +475,318 @@
     LocationString:  top.cpu.core0.lsu.lsu_inst_queue.lsu_inst_queue0
     t_offset:   -10
     type:           schedule_line
-  - Content: auto_color_annotation
+  - Content: auto_color_anno_notext
     color:      (192,192,192)
-    dimensions: (720,15)
+    dimensions: (720,5)
     position:   (159,527)
-    LocationString:  top.cpu.core0.lsu.dcache_busy
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer7
     t_offset:   -10
     type:           schedule_line
-  - Content: auto_color_annotation
+  - Content: auto_color_anno_notext
     color:      (192,192,192)
-    dimensions: (720,15)
+    dimensions: (720,5)
+    position:   (159,532)
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer6
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_anno_notext
+    color:      (192,192,192)
+    dimensions: (720,5)
+    position:   (159,537)
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer5
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_anno_notext
+    color:      (192,192,192)
+    dimensions: (720,5)
     position:   (159,542)
-    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline4
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer4
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_anno_notext
+    color:      (192,192,192)
+    dimensions: (720,5)
+    position:   (159,547)
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer3
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_anno_notext
+    color:      (192,192,192)
+    dimensions: (720,5)
+    position:   (159,552)
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer2
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
     position:   (159,557)
-    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline3
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer1
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
     position:   (159,572)
-    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline2
+    LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer0
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
     position:   (159,587)
-    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline1
+    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline0
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
     position:   (159,602)
-    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline0
+    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline1
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_annotation
+    color:      (192,192,192)
+    dimensions: (720,15)
+    position:   (159,617)
+    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline2
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_annotation
+    color:      (192,192,192)
+    dimensions: (720,15)
+    position:   (159,632)
+    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline3
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_annotation
+    color:      (192,192,192)
+    dimensions: (720,15)
+    position:   (159,647)
+    LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline4
+    t_offset:   -10
+    type:           schedule_line
+  - Content: auto_color_anno_nomunge
+    color:      (192,192,192)
+    dimensions: (720,15)
+    position:   (159,662)
+    LocationString:  top.cpu.core0.lsu.dcache_busy
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,617)
+    position:   (159,677)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer29
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,622)
+    position:   (159,682)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer28
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,627)
+    position:   (159,687)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer27
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,632)
+    position:   (159,692)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer26
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,637)
+    position:   (159,697)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer25
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,642)
+    position:   (159,702)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer24
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,647)
+    position:   (159,707)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer23
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,652)
+    position:   (159,712)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer22
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,657)
+    position:   (159,717)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer21
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,662)
+    position:   (159,722)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer20
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,667)
+    position:   (159,727)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer19
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,672)
+    position:   (159,732)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer18
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,677)
+    position:   (159,737)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer17
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,682)
+    position:   (159,742)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer16
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,687)
+    position:   (159,747)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer15
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,692)
+    position:   (159,752)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer14
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,697)
+    position:   (159,757)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer13
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,702)
+    position:   (159,762)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer12
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,707)
+    position:   (159,767)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer11
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,712)
+    position:   (159,772)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer10
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,717)
+    position:   (159,777)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer9
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,722)
+    position:   (159,782)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer8
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,727)
+    position:   (159,787)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer7
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_notext
     color:      (192,192,192)
     dimensions: (720,5)
-    position:   (159,732)
+    position:   (159,792)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer6
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,737)
+    position:   (159,797)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer5
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,752)
+    position:   (159,812)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer4
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,767)
+    position:   (159,827)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer3
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,782)
+    position:   (159,842)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer2
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,797)
+    position:   (159,857)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer1
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_annotation
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,812)
+    position:   (159,872)
     LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer0
     t_offset:   -10
     type:           schedule_line
   - Content: auto_color_anno_nomunge
     color:      (192,192,192)
     dimensions: (720,15)
-    position:   (159,827)
+    position:   (159,887)
     LocationString:  top.cpu.core0.dispatch.in_reorder_flush
     t_offset:   -10
     type:           schedule_line
@@ -1136,226 +1192,274 @@
   position:   (1049,512)
   LocationString:  top.cpu.core0.lsu.lsu_inst_queue.lsu_inst_queue0
   t_offset:   0
-- Content: auto_color_annotation
+- Content: auto_color_anno_notext
   color:      (192,192,192)
-  dimensions: (150,15)
+  dimensions: (150,5)
   position:   (1049,527)
-  LocationString:  top.cpu.core0.lsu.dcache_busy
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer7
   t_offset:   0
-- Content: auto_color_annotation
+- Content: auto_color_anno_notext
   color:      (192,192,192)
-  dimensions: (150,15)
+  dimensions: (150,5)
+  position:   (1049,532)
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer6
+  t_offset:   0
+- Content: auto_color_anno_notext
+  color:      (192,192,192)
+  dimensions: (150,5)
+  position:   (1049,537)
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer5
+  t_offset:   0
+- Content: auto_color_anno_notext
+  color:      (192,192,192)
+  dimensions: (150,5)
   position:   (1049,542)
-  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline4
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer4
+  t_offset:   0
+- Content: auto_color_anno_notext
+  color:      (192,192,192)
+  dimensions: (150,5)
+  position:   (1049,547)
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer3
+  t_offset:   0
+- Content: auto_color_anno_notext
+  color:      (192,192,192)
+  dimensions: (150,5)
+  position:   (1049,552)
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer2
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (1049,557)
-  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline3
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer1
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (1049,572)
-  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline2
+  LocationString:  top.cpu.core0.lsu.replay_buffer.replay_buffer0
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (1049,587)
-  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline1
+  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline0
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (1049,602)
-  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline0
+  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline1
+  t_offset:   0
+- Content: auto_color_annotation
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (1049,617)
+  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline2
+  t_offset:   0
+- Content: auto_color_annotation
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (1049,632)
+  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline3
+  t_offset:   0
+- Content: auto_color_annotation
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (1049,647)
+  LocationString:  top.cpu.core0.lsu.LoadStorePipeline.LoadStorePipeline4
+  t_offset:   0
+- Content: auto_color_anno_nomunge
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (1049,662)
+  LocationString:  top.cpu.core0.lsu.dcache_busy
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,617)
+  position:   (1049,677)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer29
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,622)
+  position:   (1049,682)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer28
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,627)
+  position:   (1049,687)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer27
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,632)
+  position:   (1049,692)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer26
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,637)
+  position:   (1049,697)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer25
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,642)
+  position:   (1049,702)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer24
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,647)
+  position:   (1049,707)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer23
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,652)
+  position:   (1049,712)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer22
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,657)
+  position:   (1049,717)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer21
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,662)
+  position:   (1049,722)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer20
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,667)
+  position:   (1049,727)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer19
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,672)
+  position:   (1049,732)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer18
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,677)
+  position:   (1049,737)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer17
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,682)
+  position:   (1049,742)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer16
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,687)
+  position:   (1049,747)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer15
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,692)
+  position:   (1049,752)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer14
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,697)
+  position:   (1049,757)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer13
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,702)
+  position:   (1049,762)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer12
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,707)
+  position:   (1049,767)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer11
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,712)
+  position:   (1049,772)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer10
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,717)
+  position:   (1049,777)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer9
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,722)
+  position:   (1049,782)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer8
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,727)
+  position:   (1049,787)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer7
   t_offset:   0
 - Content: auto_color_anno_notext
   color:      (192,192,192)
   dimensions: (150,5)
-  position:   (1049,732)
+  position:   (1049,792)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer6
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,737)
+  position:   (1049,797)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer5
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,752)
+  position:   (1049,812)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer4
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,767)
+  position:   (1049,827)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer3
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,782)
+  position:   (1049,842)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer2
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,797)
+  position:   (1049,857)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer1
   t_offset:   0
 - Content: auto_color_annotation
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,812)
+  position:   (1049,872)
   LocationString:  top.cpu.core0.rob.ReorderBuffer.ReorderBuffer0
   t_offset:   0
 - Content: auto_color_anno_nomunge
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (1049,827)
+  position:   (1049,887)
   LocationString:  top.cpu.core0.dispatch.in_reorder_flush
   t_offset:   0
 - Content: caption
@@ -1592,272 +1696,302 @@
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (10,467)
-  caption:    LSU IQ
+  caption:    LSU IQ[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,468)
-  caption:    LSU IQ
+  caption:    LSU IQ[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,497)
-  caption:    LSU IQ1
+  caption:    LSU IQ[
]1
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,498)
-  caption:    LSU IQ1
+  caption:    LSU IQ[
]1
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,512)
-  caption:    LSU IQ0
+  caption:    LSU IQ[
]0
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,513)
-  caption:    LSU IQ0
+  caption:    LSU IQ[
]0
 - Content: caption
   color:      (192,192,192)
-  dimensions: (150,15)
+  dimensions: (150,14)
   position:   (10,527)
-  caption:    DL1 busy
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,528)
-  caption:    DL1 busy
-- Content: caption
-  color:      (192,192,192)
-  dimensions: (150,15)
-  position:   (10,542)
-  caption:    LSU Pipe4
-- Content: caption
-  color:      (192,192,192)
-  dimensions: (150,14)
-  position:   (899,543)
-  caption:    LSU Pipe4
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,557)
-  caption:    LSU Pipe3
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,558)
-  caption:    LSU Pipe3
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,572)
-  caption:    LSU Pipe2
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,573)
-  caption:    LSU Pipe2
+  caption:    LSU Replay[
]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,587)
-  caption:    LSU Pipe1
+  caption:    LSU Pipe0
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,588)
-  caption:    LSU Pipe1
+  caption:    LSU Pipe0
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
   position:   (10,602)
-  caption:    LSU Pipe0
+  caption:    LSU Pipe1
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,603)
-  caption:    LSU Pipe0
+  caption:    LSU Pipe1
 - Content: caption
   color:      (192,192,192)
-  dimensions: (150,14)
+  dimensions: (150,15)
   position:   (10,617)
-  caption:    ROB[29-6]
+  caption:    LSU Pipe2
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
   position:   (899,618)
+  caption:    LSU Pipe2
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (10,632)
+  caption:    LSU Pipe3
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,14)
+  position:   (899,633)
+  caption:    LSU Pipe3
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (10,647)
+  caption:    LSU Pipe4
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,14)
+  position:   (899,648)
+  caption:    LSU Pipe4
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,15)
+  position:   (10,662)
+  caption:    DL1 busy
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,14)
+  position:   (899,663)
+  caption:    DL1 busy
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,14)
+  position:   (10,677)
+  caption:    ROB[29-6]
+- Content: caption
+  color:      (192,192,192)
+  dimensions: (150,14)
+  position:   (899,678)
   caption:    ROB[29-6]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,737)
+  position:   (10,797)
   caption:    ROB[5]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,738)
+  position:   (899,798)
   caption:    ROB[5]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,752)
+  position:   (10,812)
   caption:    ROB[4]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,753)
+  position:   (899,813)
   caption:    ROB[4]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,767)
+  position:   (10,827)
   caption:    ROB[3]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,768)
+  position:   (899,828)
   caption:    ROB[3]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,782)
+  position:   (10,842)
   caption:    ROB[2]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,783)
+  position:   (899,843)
   caption:    ROB[2]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,797)
+  position:   (10,857)
   caption:    ROB[1]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,798)
+  position:   (899,858)
   caption:    ROB[1]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,812)
+  position:   (10,872)
   caption:    ROB[0]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,813)
+  position:   (899,873)
   caption:    ROB[0]
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,827)
+  position:   (10,887)
   caption:    ROB flush
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,14)
-  position:   (899,828)
+  position:   (899,888)
   caption:    ROB flush
 - Content: caption
   color:      (192,192,192)
   dimensions: (150,15)
-  position:   (10,842)
+  position:   (10,902)
   caption:    C=1 Cycle
 - Content: cycle
   color:      (192,192,192)
   dimensions: (100,15)
-  position:   (60,842)
+  position:   (60,902)
   LocationString:  .*rob.ReorderBuffer.ReorderBuffer0
   t_offset:   0
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (160,842)
+  position:   (160,902)
   caption:    C=1 -10
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (200,842)
+  position:   (200,902)
   caption:    C=1 -5
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (240,842)
+  position:   (240,902)
   caption:    C=1 0
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (280,842)
+  position:   (280,902)
   caption:    C=1 5
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (320,842)
+  position:   (320,902)
   caption:    C=1 10
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (360,842)
+  position:   (360,902)
   caption:    C=1 15
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (400,842)
+  position:   (400,902)
   caption:    C=1 20
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (440,842)
+  position:   (440,902)
   caption:    C=1 25
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (480,842)
+  position:   (480,902)
   caption:    C=1 30
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (520,842)
+  position:   (520,902)
   caption:    C=1 35
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (560,842)
+  position:   (560,902)
   caption:    C=1 40
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (600,842)
+  position:   (600,902)
   caption:    C=1 45
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (640,842)
+  position:   (640,902)
   caption:    C=1 50
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (680,842)
+  position:   (680,902)
   caption:    C=1 55
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (720,842)
+  position:   (720,902)
   caption:    C=1 60
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (760,842)
+  position:   (760,902)
   caption:    C=1 65
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (800,842)
+  position:   (800,902)
   caption:    C=1 70
 - Content: caption
   color:      (192,192,192)
   dimensions: (40,15)
-  position:   (840,842)
+  position:   (840,902)
   caption:    C=1 75
 - Content: caption
   color:      (0,0,0)
@@ -1897,11 +2031,11 @@
 - Content: caption
   color:      (0,0,0)
   dimensions: (870,1)
-  position:   (10,617)
+  position:   (10,662)
   caption:    
 - Content: caption
   color:      (0,0,0)
   dimensions: (870,1)
-  position:   (10,827)
+  position:   (10,887)
   caption:    
 ...