buffer rework