Updated the buffer part