New style!
Back-port buffering and clean-up