removed isConnected check