buffer overhaul