Added bipbuffer back