Handling buffer insertions