           uint8_t day  = GPSData.day;
           uint8_t month = GPSData.month;
           uint16_t year = GPSData.year;
-#ifdef CONVERT_TO_LOCAL
-          // Convert UTC time to local time (no need to convert the date)
-          bool DST = convertToLocal (&hour, &year, &month,
-                                     &day, GPSData.lon, false); // false means no date conversion
-#else // #ifdef CONVERT_TO_LOCAL
-#ifdef DISPLAY_12_HOUR
-          if (hour == 0) { // 12 hour clocks don't display 0
-            hour = 12;
+          bool DST = false;
+          if (localUTCTimeDate) {
+            // Convert UTC time to local time (no need to convert the date)
+            DST = convertToLocal (&hour, &year, &month,
+                                  &day, GPSData.lon, false); // false means no date conversion
           }
-#endif // #ifdef DISPLAY_12_HOUR
-#endif // #ifdef CONVERT_TO_LOCAL
-#ifdef DISPLAY_12_HOUR
+          else { // if (localUTCTimeDate)
+            if (display12_24_Hour) {
+              if (hour == 0) { // 12 hour clocks don't display 0
+                hour = 12;
+              }
+            } // if (display12_24_Hour)
+          } // if (localUTCTimeDate)
           char AMPM[] = "am";
-          if (hour >= 12) { // Convert to 12 hour format
-            if (hour > 12) hour -= 12;
-            strcpy (AMPM, "pm");
-          }
-#endif
+          if (display12_24_Hour) {
+            if (hour >= 12) { // Convert to 12 hour format
+              if (hour > 12) hour -= 12;
+              strcpy (AMPM, "pm");
+            }
+          } // if (display12_24_Hour)
           if (hour < 10) lcd.print("0");
           lcd.print(hour);
           lcd.print(":");

        prevHeadingTime = now;
        if (headingToggle) { // Display cardinal heading
          headingToggle = false;
          lcd.print(cardinal(GPSData.heading));
        }
        else { // Display degrees heading
          headingToggle = true;

  return previousSunday <= 0;
}

/* Convert UTC time and date to local time and date
   Difference between UTC time/date (at Greenwich) and local time/date is 15 minutes
   per 1 degree of longitude. See the following:
