Made the buffer do things better