     delay(10000);
 
     // attempt to connect to Wifi network:
-    if(wifiConnect(ssid, pass, timeout)) {
-
-      String clientIdStr = "microblu_" + String(random(500000)) + "_" + String(random(500000));
+    if(wifiConnect(WIFI_SSID, WIFI_PASSWORD, timeout)) {
+
+      String clientIdStr = "mb" + String(random(500000));
       int clientId_len = clientIdStr.length() + 1;
       char clientId[clientId_len];
       clientIdStr.toCharArray(clientId, clientId_len);    
 
       if (microblu.connect(clientId, UUID, TOKEN)){
-  
         //success!
         Serial.println(F("connected"));
   
         //you need to subscribe to your uuid to get messages for you
         microblu.subscribe(UUID);
         
-      }
-      
-    }else
-    {
-        Serial.print(F("couldnt connect to: "));
-        Serial.println(ssid);
+      }else
+      {
+          Serial.print(F("couldnt connect to: "));
+          Serial.println(WIFI_SSID);
+      }
     }
   } 
 }

    // skip SPI pins for Ethernet/Wifi Shield //JJR
    //if ( (i==CC3000_INT) || (i==CC3000_EN) || (i==CC3000_CS) || (i==MOSI) || (i==MISO) || (i==SCK) || (i==SS) )
    //  continue;

    if (IS_PIN_ANALOG(i)) {
      // turns off pullup, configures everything


  Serial.begin(9600);

  wifiConnect(WIFI_SSID, WIFI_PASSWORD, timeout);
  /*;
  if ( wifi.init() ) {
    Serial.println(F("CC3000 initialization complete"));
