Refactor to use new _next_connection() both at startup and when