Improve connection experience