First attempt at better tracking the connection status