add disable buffering feature