Modified buffering implementation