diff --git a/lib/CPUs/MIPS/sim/tb_mips_top.wdo b/lib/CPUs/MIPS/sim/tb_mips_top.wdo
index 5f5ff8a..12b16c3 100644
--- a/lib/CPUs/MIPS/sim/tb_mips_top.wdo
+++ b/lib/CPUs/MIPS/sim/tb_mips_top.wdo
@@ -118,7 +118,9 @@ add wave -noupdate -format Literal /tb_mips_top/uut/inst_pipeline/hdu
 add wave -noupdate -format Literal /tb_mips_top/uut/inst_pipeline/sdu
 add wave -noupdate -divider PC
 add wave -noupdate -format Logic /tb_mips_top/clk
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_pipeline/pc
+add wave -noupdate -format Logic -radix hexadecimal /tb_mips_top/uut/inst_pipeline/ex_stage.ctrl.branch
+add wave -noupdate -format Logic /tb_mips_top/uut/inst_pipeline/branch_ce
+add wave -noupdate -format Literal -radix hexadecimal -expand /tb_mips_top/uut/inst_pipeline/pc
 add wave -noupdate -divider COP0
 add wave -noupdate -format Logic /tb_mips_top/uut/inst_cop/ir_en
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_cop/ir
@@ -160,47 +162,25 @@ add wave -noupdate -divider I-Cache
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/ctrl
 add wave -noupdate -format Logic /tb_mips_top/clk
 add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/cpu_en
-add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/cpu_req
 add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/cpu_busy
-add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/cache_rdy
-add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/cache_hit
 add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/tag_match
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/cpu_addr
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/cpu_dout
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/cpu_req_addr
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/request_addr
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/fill_addr
 add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_icache/request_count
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/flush_count
 add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_icache/fill_count
-add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_icache/pv_reg
-add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/pv
-add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_icache/cs
 add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_icache/s
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/cache_entry_out
-add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/tag_ram_re
-add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/data_ram_re
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/data_b_addr
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/data_b_dout
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/data_a_addr
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/data_a_din
 add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/data_ram_we
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/tag_b_addr
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/tag_b_dout
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/tag_a_dout
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/tag_a_addr
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/tag_a_din
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/tag_b_din
 add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_icache/tag_ram_we
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_icache/inst_tag_ram/ram
 add wave -noupdate -divider D-Cache
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/dcache_dbg
 add wave -noupdate -format Logic /tb_mips_top/clk
 add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/mrdy_o
 add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/cpu_en
 add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/cpu_busy
-add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/cpu_bsy
-add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/cpu_req
 add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_dcache/cpu_be
 add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/cpu_we
 add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/cpu_hit_we
@@ -208,42 +188,25 @@ add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/instant_r
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/cpu_din
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/cpu_dout
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/cpu_addr
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/cpu_req_addr
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/cpu_data_reg
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/request_addr
 add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_dcache/request_count
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/fill_addr
 add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_dcache/fill_count
 add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_dcache/flush_count
-add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/cache_rdy
 add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/cache_hit
 add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/tag_match
-add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_dcache/pv_reg
-add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/pv
 add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_dcache/s
-add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_dcache/cs
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/dat_i
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/cache_entry_in
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/cache_entry_out
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/cpu_data_reg
 add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_dcache/cpu_be_reg
 add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/cpu_we_reg
-add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_dcache/data_a_we
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/data_a_addr
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/data_a_dout
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/data_a_din
-add wave -noupdate -format Literal /tb_mips_top/uut/inst_biu/inst_dcache/data_b_we
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/data_b_addr
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/data_b_dout
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/data_b_din
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/tag_b_addr
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/tag_b_dout
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/tag_a_dout
-add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/tag_a_addr
 add wave -noupdate -format Literal -radix hexadecimal /tb_mips_top/uut/inst_biu/inst_dcache/tag_ram_din
 add wave -noupdate -format Logic /tb_mips_top/uut/inst_biu/inst_dcache/tag_ram_we
 TreeUpdate [SetDefaultTree]
-WaveRestoreCursors {Cursor {1309445000 ps} 0}
+WaveRestoreCursors {Cursor {5877623 ps} 0}
 configure wave -namecolwidth 188
 configure wave -valuecolwidth 154
 configure wave -justifyvalue left
@@ -257,4 +220,4 @@ configure wave -gridperiod 100
 configure wave -griddelta 40
 configure wave -timeline 1
 update
-WaveRestoreZoom {0 ps} {1575 us}
+WaveRestoreZoom {5846736 ps} {5910641 ps}