 #define	MAX_GPRS_READ_BUFFER	64
 
 #ifdef WIFI_NOT_CELL
-WiFiClient wifi_client;
+Adafruit_CC3000 cc3000 = Adafruit_CC3000(ADAFRUIT_CC3000_CS, ADAFRUIT_CC3000_IRQ, ADAFRUIT_CC3000_VBAT, SPI_CLOCK_DIVIDER);
+Adafruit_CC3000_Client cc3000_client;
+
 bool wifi_on_home_network;
 
 enum wireless_communication_state

      gprs_or_wifi_communications_on = true;
      #ifndef WIFI_NOT_CELL
      #ifdef GPRS_DEBUG_ON
      debug_info("*** Rebooting GPRS (Watchdog)  ***");
      #endif
      Serial1.println(F("AT+CFUN=0,1"));
      gprs_connection_state = waiting_for_sind;

      gprs_or_wifi_watchdog_timestamp = current_timestamp;
      Serial1.println(F("AT+CGACT=1,1"));
      #ifdef GPRS_DEBUG_ON
      debug_info(F("Waiting on ACT=1,1..."));
      #endif
    }
    else if(gprs_connection_state == waiting_for_pdp_context_active && gprs_read_buffer.indexOf("OK") > 0)
