diff --git a/src/gps_utils.cpp b/src/gps_utils.cpp
index 962ce4d..f362683 100644
--- a/src/gps_utils.cpp
+++ b/src/gps_utils.cpp
@@ -41,11 +41,7 @@ namespace GPS_Utils {
       logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "Main", "GPS disabled");
       return;
     }
-    #if defined(TTGO_T_Beam_S3_SUPREME_V3)
-    neo6m_gps.begin(9600, SERIAL_8N1, GPS_RX, GPS_TX);
-    #else
     neo6m_gps.begin(9600, SERIAL_8N1, GPS_TX, GPS_RX);
-    #endif
   }
 
   void calculateDistanceCourse(String Callsign, double checkpointLatitude, double checkPointLongitude) {
diff --git a/src/pins_config.h b/src/pins_config.h
index 94810e1..76e8f16 100644
--- a/src/pins_config.h
+++ b/src/pins_config.h
@@ -69,67 +69,74 @@
 
 
 #if defined(TTGO_T_Beam_S3_SUPREME_V3)
-#define OLED_SDA                    17
-#define OLED_SCL                    18
-#define OLED_RST                    16
+#define OLED_SDA        17
+#define OLED_SCL        18
+#define OLED_RST        16
   
-#define SDA                         17
-#define SCL                         18
+#define SDA             17
+#define SCL             18
 
-#define I2C1_SDA                    42
-#define I2C1_SCL                    41
-#define PMU_IRQ                     40
-#define IRQ_PIN                     40
+#define I2C1_SDA        42
+#define I2C1_SCL        41
+//#define PMU_IRQ                     40    // double defined in power_utils.cpp
+//#define IRQ_PIN                     40    // double defined in power_utils.cpp
 
+#define GPS_RX          8       // changed to maintain the same "neo6m_gps.begin(9600, SERIAL_8N1, GPS_TX, GPS_RX);"
+#define GPS_TX          9       // 8 for 9 and 9 for 8
 
-#define GPS_RX                      9
-#define GPS_TX                      8
-#define GPS_WAKEUP_PIN              7
-#define GPS_1PPS_PIN                6
+/*      NOT USED????
+//#define GPS_WAKEUP_PIN  7       // ??
+//#define GPS_1PPS_PIN    6       // ??*/
 
-#define BUTTON_PIN                  0
-#define BUTTON_PIN_MASK             GPIO_SEL_0
-#define BUTTON_CONUT                (1)
-#define BUTTON_ARRAY                {BUTTON_PIN}
+#define BUTTON_PIN      0
 
+/*      NOT USED????
+//#define BUTTON_PIN_MASK GPIO_SEL_0    // ??
+//#define BUTTON_CONUT    1             // ??
+//#define BUTTON_ARRAY    BUTTON_PIN    // ??*/
 
-#define RADIO_SCLK_PIN              (12)
-#define RADIO_MISO_PIN              (13)
-#define RADIO_MOSI_PIN              (11)
-#define RADIO_CS_PIN                (10)
-#define RADIO_DIO0_PIN               (-1)
-#define RADIO_RST_PIN               (5)
-#define RADIO_DIO1_PIN              (1)
-#define RADIO_BUSY_PIN              (4)
+#define RADIO_SCLK_PIN  12
+#define RADIO_MISO_PIN  13
+#define RADIO_MOSI_PIN  11
+#define RADIO_CS_PIN    10
+#define RADIO_DIO0_PIN  -1
+#define RADIO_RST_PIN   5
+#define RADIO_DIO1_PIN  1
+#define RADIO_BUSY_PIN  4
 
+/*      NOT USED????
+/*#define SPI_MOSI                    35      // ??
+#define SPI_SCK                     36      // ??
+#define SPI_MISO                    37      // ??
+#define SPI_CS                      47      // ??
+#define IMU_CS                      34      // ??
+#define IMU_INT                     33      // ??*/
 
-#define SPI_MOSI                    (35)
-#define SPI_SCK                     (36)
-#define SPI_MISO                    (37)
-#define SPI_CS                      (47)
-#define IMU_CS                      (34)
-#define IMU_INT                     (33)
+/*      NOT USED????
+#define SDCARD_MOSI                 SPI_MOSI    // ??
+#define SDCARD_MISO                 SPI_MISO    // ??
+#define SDCARD_SCLK                 SPI_SCK     // ??
+#define SDCARD_CS                   SPI_CS      // ??*/
 
-#define SDCARD_MOSI                 SPI_MOSI
-#define SDCARD_MISO                 SPI_MISO
-#define SDCARD_SCLK                 SPI_SCK
-#define SDCARD_CS                   SPI_CS
+/*      NOT USED????
+#define PIN_NONE                    -1          // ??
+#define RTC_INT                     14          // ??*/
 
-#define PIN_NONE                    (-1)
-#define RTC_INT                     (14)
+//#define GPS_BAUD_RATE               9600      // not used!!
 
-#define GPS_BAUD_RATE               9600
+/*      NOT USED????
+#define HAS_SDCARD      // ??
+#define HAS_GPS      // ??
+#define HAS_DISPLAY      // ??
+#define HAS_PMU      // ??*/
 
-#define HAS_SDCARD
-#define HAS_GPS
-#define HAS_DISPLAY
-#define HAS_PMU
+/*      NOT USED????
+#define __HAS_SPI1__      // ??
+#define __HAS_SENSOR__      // ??*/
 
-#define __HAS_SPI1__
-#define __HAS_SENSOR__
+//#define PMU_WIRE_PORT   Wire1      // ??
+//#define DISPLAY_MODEL   U8G2_SH1106_128X64_NONAME_F_HW_I2C
 
-#define PMU_WIRE_PORT   Wire1
-#define DISPLAY_MODEL   U8G2_SH1106_128X64_NONAME_F_HW_I2C
 #endif