Buffering improvement.