Added buffering update