diff --git a/lib/misc/bbfifo.vhd b/lib/misc/bbfifo.vhd
index 4c7895f..a067b93 100644
--- a/lib/misc/bbfifo.vhd
+++ b/lib/misc/bbfifo.vhd
@@ -50,69 +50,46 @@ end bbfifo;
 architecture Behavioral of bbfifo is
 
 	type bucket_array_t is array (0 to depth) of unsigned(data_width-1 downto 0);
-	signal req : unsigned(0 to depth);
-	signal rdy : unsigned(1 to depth+1);
-	signal bucket_array : bucket_array_t; 
-	signal ce_in : unsigned(1 to depth);
-	signal ce_out : unsigned(1 to depth);
+	signal bucket_array 	: bucket_array_t; 
+	signal Q				: unsigned(0 to depth)		:= (others => '0');
+	signal ce				: unsigned(1 to depth+1)		:= (others => '0');
 	
 begin
 	
-	req(0)			<= we;
-	rdy(depth+1)	<= re;
-	ready			<= '1' when req(0 to depth-1) /= (0 to depth-1 => '1') else '0';
-	avail			<= req(depth);
+	Q(0)			<= we;
+	ce(depth+1)		<= re;
+	ready			<= ce(1);
+	avail			<= Q(depth);
 	bucket_array(0)	<= din;
 	dout			<= bucket_array(depth);
 	
-gen_ce:
+gen_bb:
 	for i in 1 to depth generate
-	begin
-		process (rdy, req)
+		proc_ce:
+		process(Q, ce)
 		begin
-			ce_in(i) <= not req(i) and req(i-1);
+			ce(i) <= not Q(i) or ce(i+1);
 		end process;
-	end generate;
 
-gen_rdy:
-	for i in 1 to depth generate
-	begin
-		process (clk)
+		proc_q:
+		process(clk)
 		begin
 			if rising_edge(clk) then
 				if rst = '1' then
-					rdy(i) <= '1';
-				elsif req(i-1) = '1' then
-					rdy(i) <= rdy(i+1);
+					Q(i)	<= '0';
+				elsif ce(i) = '1' then
+					Q(i)	<= Q(i-1);
 				end if;
 			end if;
 		end process;
-	end generate;
 
-gen_req:
-	for i in 1 to depth generate
-	begin
-		process (clk)
-		begin
-			if rising_edge(clk) then
-				if rst = '1' then
-					req(i) <= '0';
-				elsif rdy(i+1) = '1' then
-					req(i) <= req(i-1);
-				end if;
-			end if;
-		end process;
-	end generate;
-
-gen_data:
-	for i in 1 to depth generate
-	begin
+		proc_data:
 		process (clk)
 		begin
 			if rising_edge(clk) then
 				if rst = '1' then
 					bucket_array(i) <= (others => '0');
-				elsif req(i-1) = '1' then
+				elsif ce(i) = '1' then
 					bucket_array(i) <= bucket_array(i-1);
 				end if;
 			end if;
diff --git a/lib/misc/sim/tb_bbfifo.wdo b/lib/misc/sim/tb_bbfifo.wdo
index 06b107e..b97cf38 100644
--- a/lib/misc/sim/tb_bbfifo.wdo
+++ b/lib/misc/sim/tb_bbfifo.wdo
@@ -1,31 +1,30 @@
-onerror {resume}
-quietly WaveActivateNextPane {} 0
-add wave -noupdate -format Logic /tb_bbfifo/rst
-add wave -noupdate -format Logic /tb_bbfifo/clk
-add wave -noupdate -format Logic /tb_bbfifo/re
-add wave -noupdate -format Logic /tb_bbfifo/we
-add wave -noupdate -format Logic /tb_bbfifo/ready
-add wave -noupdate -format Logic /tb_bbfifo/avail
-add wave -noupdate -format Literal -radix hexadecimal /tb_bbfifo/din
-add wave -noupdate -format Literal -radix hexadecimal /tb_bbfifo/dout
-add wave -noupdate -format Literal /tb_bbfifo/inst_bbfifo/req
-add wave -noupdate -format Literal /tb_bbfifo/inst_bbfifo/rdy
-add wave -noupdate -format Literal -radix hexadecimal -expand /tb_bbfifo/inst_bbfifo/bucket_array
-add wave -noupdate -format Literal /tb_bbfifo/inst_bbfifo/ce_in
-add wave -noupdate -format Literal /tb_bbfifo/inst_bbfifo/ce_out
-TreeUpdate [SetDefaultTree]
-WaveRestoreCursors {{Cursor 1} {170000 ps} 0}
-configure wave -namecolwidth 150
-configure wave -valuecolwidth 100
-configure wave -justifyvalue left
-configure wave -signalnamewidth 1
-configure wave -snapdistance 10
-configure wave -datasetprefix 0
-configure wave -rowmargin 4
-configure wave -childrowmargin 2
-configure wave -gridoffset 0
-configure wave -gridperiod 1
-configure wave -griddelta 40
-configure wave -timeline 0
-update
-WaveRestoreZoom {76738 ps} {299465 ps}
+onerror {resume}
+quietly WaveActivateNextPane {} 0
+add wave -noupdate -format Logic /tb_bbfifo/rst
+add wave -noupdate -format Logic /tb_bbfifo/clk
+add wave -noupdate -format Logic /tb_bbfifo/re
+add wave -noupdate -format Logic /tb_bbfifo/we
+add wave -noupdate -format Logic /tb_bbfifo/ready
+add wave -noupdate -format Logic /tb_bbfifo/avail
+add wave -noupdate -format Literal -radix hexadecimal /tb_bbfifo/din
+add wave -noupdate -format Literal -radix hexadecimal /tb_bbfifo/dout
+add wave -noupdate -format Literal -radix hexadecimal /tb_bbfifo/inst_bbfifo/bucket_array
+add wave -noupdate -format Literal /tb_bbfifo/inst_bbfifo/q
+add wave -noupdate -format Literal /tb_bbfifo/inst_bbfifo/ce
+add wave -noupdate -format Literal -radix hexadecimal /tb_bbfifo/dout_reg
+TreeUpdate [SetDefaultTree]
+WaveRestoreCursors {{Cursor 1} {49969 ps} 0}
+configure wave -namecolwidth 150
+configure wave -valuecolwidth 100
+configure wave -justifyvalue left
+configure wave -signalnamewidth 1
+configure wave -snapdistance 10
+configure wave -datasetprefix 0
+configure wave -rowmargin 4
+configure wave -childrowmargin 2
+configure wave -gridoffset 0
+configure wave -gridperiod 1
+configure wave -griddelta 40
+configure wave -timeline 0
+update
+WaveRestoreZoom {0 ps} {1050 ns}
diff --git a/lib/misc/tb_bbfifo.vhd b/lib/misc/tb_bbfifo.vhd
index 95fa7b9..56e3b39 100644
--- a/lib/misc/tb_bbfifo.vhd
+++ b/lib/misc/tb_bbfifo.vhd
@@ -75,7 +75,7 @@ RE_GEN: process
 	begin
 		wait for 2*CLK_PERIOD;
 		wait until rising_edge(clk) and avail = '1';
-		re <= '0';
+		re <= '1';
 		dout_reg <= dout;
 		wait until rising_edge(clk);
 		re <= '0';
@@ -127,6 +127,10 @@ STIMULUS: process
 		we <= '1';
 		din <= din + 1;
 		wait until rising_edge(clk) and ready = '1';
+		we <= '1';
+		din <= din + 1;
+		wait until rising_edge(clk) and ready = '1';
+		we <= '0';
 		
 
 		wait;