Two buffers changed to buffer+delta structure