Bufferc overhaul