improve control over buffering