added connection status
fixed conflict