Added buffering