Improve disconnect feedback