The great buffer overhaul