Better buffers and folding