Some changes for buffers(2)