Buffering improved