 
   String APIKEY(APIKey);
   String CityID(cityID);
-  if (client.connect(servername, 80)) {  //starts client connection, checks for connection
+  if (client.connect(serverName.c_str(), 80)) { // Starts client connection, checks for connection
     client.println("GET /data/2.5/forecast?id=" + CityID + "&units=imperial&cnt=1&APPID=" + APIKEY);
-    client.println("Host: api.openweathermap.org");
+    client.println("Host: " + serverName);
     client.println("User-Agent: ArduinoWiFi/1.1");
     client.println("Connection: close");
     client.println();
   }
   else {
 #ifdef DEBUG
-    Serial.println("connection failed"); //error message if no client connect
+    Serial.println("connection failed"); // Error message if no client connect
     Serial.println();
 #endif
     return;

    case 800: drawClearWeather(); break;
    case 801: drawFewClouds(); break;
    case 802: drawFewClouds(); break;
    case 803: drawCloud(); break;
    case 804: drawCloud(); break;

    case 200: drawThunderstorm(); break;

  timeS = timeS.substring(length - 8, length - 6); // Strip out the hours
  int time = timeS.toInt();

#ifdef ERROROFFSET
  // For some reason, openweathermap.org time is off by some (???)
  // hours from UTC. Need to compensate
  int TimeErrorOffset = -3;
