     lcd.setCursor (0, 1); // Go to 2nd line
     lcd.print("Lon: ");
     lcd.print(GPSData.lon);
-#ifndef CONVERT_TO_LOCAL
-    // Only display if time/date is selected
-    if (!(digitalRead(ALTITUDE_DATE_TIME_SW))) {
-      lcd.print("      "); // Clear the extra chars
-      uint8_t DOW = dayOfWeek(GPSData.year, GPSData.month, GPSData.day);
-      if (IsDST(GPSData.day, GPSData.month, DOW)) {
-        lcd.print("DST");
+    if ((digitalRead(ALTITUDE_DATE_TIME_SW))) {
+      // Only display if time/date is selected
+      if (!localUTCTimeDate) {
+        lcd.print("      "); // Clear the extra chars
+        uint8_t DOW = dayOfWeek(GPSData.year, GPSData.month, GPSData.day);
+        if (IsDST(GPSData.day, GPSData.month, DOW)) {
+          lcd.print("DST");
+        }
+        else {
+          lcd.print(" ST");
+        }
       }
       else {
-        lcd.print(" ST");
-      }
-    }
+        lcd.print("         "); // Clear the extra chars
+      }
+    } // if ((digitalRead(ALTITUDE_DATE_TIME_SW)))
     else {
-      lcd.print("         "); // Clear the extra chars
-    }
-#else // #ifndef CONVERT_TO_LOCAL
-#ifdef DISPLAY_HDOP
-    // Display Horizontal Dilution of Precision (Hdop) with the format X.X
-    // It comes in from the GPS module as XXX
-    // If you care how Hdop is computed (I don't :-(), see the following:
-    // http://www2.unb.ca/gge/Resources/gpsworld.may99.pdf
-    float Hdop = (float)GPSData.hdop / 100.0f; // Hdop in X.X format
-    lcd.print(" Hdop:");
-    if (Hdop < 10.0f) {
-      lcd.print(Hdop);
-    }
-    else {
-      // Hdop value too large for my LCD, so cross it out
-      // Toggle Hdop indicator every TOGGLETIME_INTERVAL seconds
-      if (now - prevHdopTime > TOGGLETIME_INTERVAL / 3) {
-        prevHdopTime = now;
-        if (hdopToggle) {
-          hdopToggle = false;
-          lcd.print("XXX");
+      if (!displayHdop) {
+        // Display Horizontal Dilution of Precision (Hdop) with the format X.X
+        // It comes in from the GPS module as XXX
+        // If you care how Hdop is computed (I don't :-(), see the following:
+        // http://www2.unb.ca/gge/Resources/gpsworld.may99.pdf
+        float Hdop = (float)GPSData.hdop / 100.0f; // Hdop in X.X format
+        lcd.print(" Hdop:");
+        if (Hdop < 10.0f) {
+          lcd.print(Hdop);
         }
         else {
-          hdopToggle = true;
-          lcd.print("   ");
-        } // if (hdopToggle)
-      } // if (now - prevHdopTime > TOGGLETIME_INTERVAL)
-    } // if (Hdop < 10.0f)
-#else // #ifdef DISPLAY_HDOP
-    // Display horizontal position error in feet
-    float hError = (float)GPSData.hdop / 100.0f; // Error in X.X format
-    hError *= GPS_RECEIVER_ERROR; // Error in meters
-    hError *= _GPS_FEET_PER_METER; // Error in feet
-    lcd.print(" Err: ");
-    if (hError < 100.0f) {
-      lcd.print((uint8_t)hError);
-      if (hError < 10.0f) {
-        lcd.print("f "); // feet
-      }
-      else {
-        lcd.print("f"); // feet
-      }
-    }
-    else { // if (hError < 100.0f)
-      // horizontal position error value too large for my LCD, so cross it out
-      // Toggle Hdop indicator every TOGGLETIME_INTERVAL seconds
-      if (now - prevHdopTime > TOGGLETIME_INTERVAL / 3) {
-        prevHdopTime = now;
-        if (hdopToggle) {
-          hdopToggle = false;
-          lcd.print("XXX");
-        }
-        else {
-          hdopToggle = true;
-          lcd.print("   ");
-        } // if (hdopToggle)
-      } // if (now - prevHdopTime > TOGGLETIME_INTERVAL)
-    } // if (hError < 100.0f)
-#endif // #ifdef DISPLAY_HDOP
-#endif // #ifndef CONVERT_TO_LOCAL
+          // Hdop value too large for my LCD, so cross it out
+          // Toggle Hdop indicator every TOGGLETIME_INTERVAL seconds
+          if (now - prevHdopTime > TOGGLETIME_INTERVAL / 3) {
+            prevHdopTime = now;
+            if (hdopToggle) {
+              hdopToggle = false;
+              lcd.print("XXX");
+            }
+            else {
+              hdopToggle = true;
+              lcd.print("   ");
+            } // if (hdopToggle)
+          } // if (now - prevHdopTime > TOGGLETIME_INTERVAL)
+        } // if (Hdop < 10.0f)
+      }
+      else { // if (!displayHdop)
+        // Display horizontal position error in feet
+        float hError = (float)GPSData.hdop / 100.0f; // Error in X.X format
+        hError *= GPS_RECEIVER_ERROR; // Error in meters
+        hError *= _GPS_FEET_PER_METER; // Error in feet
+        lcd.print(" Err: ");
+        if (hError < 100.0f) {
+          lcd.print((uint8_t)hError);
+          if (hError < 10.0f) {
+            lcd.print("f "); // feet
+          }
+          else {
+            lcd.print("f"); // feet
+          }
+        }
+        else { // if (hError < 100.0f)
+          // horizontal position error value too large for my LCD, so cross it out
+          // Toggle Hdop indicator every TOGGLETIME_INTERVAL seconds
+          if (now - prevHdopTime > TOGGLETIME_INTERVAL / 3) {
+            prevHdopTime = now;
+            if (hdopToggle) {
+              hdopToggle = false;
+              lcd.print("XXX");
+            }
+            else {
+              hdopToggle = true;
+              lcd.print("   ");
+            } // if (hdopToggle)
+          } // if (now - prevHdopTime > TOGGLETIME_INTERVAL)
+        } // if (hError < 100.0f)
+      } // if (displayHdop)
+    } // if ((digitalRead(ALTITUDE_DATE_TIME_SW)))
     lcd.setCursor (0, 2); // Go to 3rd line
     lcd.print("Spd: ");
     if (GPSData.speed < SPEED_CUTOUT) {

          lcd.print(":");
          if (GPSData.second < 10) lcd.print("0");
          lcd.print(GPSData.second);
#ifdef DISPLAY_12_HOUR
          lcd.print(AMPM);
#endif // #ifdef DISPLAY_12_HOUR
#ifdef CONVERT_TO_LOCAL
#ifdef DISPLAY_12_HOUR
          (DST) ? lcd.print(" DST") : lcd.print("  ST");
#else // #ifdef DISPLAY_12_HOUR
          (DST) ? lcd.print("   DST") : lcd.print("    ST");
#endif // #ifdef DISPLAY_12_HOUR
#endif // #ifndef CONVERT_TO_LOCAL
#ifndef CONVERT_TO_LOCAL
#ifdef DISPLAY_12_HOUR
          lcd.print(" UTC");
#else // #ifdef DISPLAY_12_HOUR
          lcd.print("   UTC");
#endif // #ifdef DISPLAY_12_HOUR
#endif // #ifndef CONVERT_TO_LOCAL
        } // if (dateTimeToggle)
        else {
          // Display date

          uint8_t day  = GPSData.day;
          uint8_t month = GPSData.month;
          uint16_t year = GPSData.year;
          bool DST = false;
          if (localUTCTimeDate) {
            // Convert UTC date to local date
            DST = convertToLocal (&hour, &year, &month,
                                  &day, GPSData.lon, true); // true means date conversion
          } // if (localUTCTimeDate)
          if (month < 10) lcd.print("0");
          lcd.print(month);
          lcd.print("/");
