Adding better connection control.