Imporved buffer