Insert strategic buffers