Buffer added, will test on fpga.