Updated version of buffers