adding leaky write buffers to everywhere