diff --git a/esp32_marauder/GpsInterface.cpp b/esp32_marauder/GpsInterface.cpp
index fa4ecd4..2c80419 100644
--- a/esp32_marauder/GpsInterface.cpp
+++ b/esp32_marauder/GpsInterface.cpp
@@ -6,7 +6,7 @@ char nmeaBuffer[100];
 
 MicroNMEA nmea(nmeaBuffer, sizeof(nmeaBuffer));
 
-HardwareSerial Serial2(2);
+HardwareSerial Serial2(GPS_SERIAL_INDEX);
 
 void GpsInterface::begin() {
 
diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp
index 3f6f979..88e2bfd 100644
--- a/esp32_marauder/WiFiScan.cpp
+++ b/esp32_marauder/WiFiScan.cpp
@@ -795,8 +795,8 @@ void WiFiScan::RunGenerateSSIDs(int count) {
 
 void WiFiScan::RunGPSInfo() {
   #ifdef HAS_GPS
+    Serial.println("Refreshing GPS Data on screen...");
     #ifdef HAS_SCREEN
-      Serial.println("Refreshing GPS Data on screen...");
 
       // Get screen position ready
       display_obj.tft.setTextWrap(false);
@@ -810,29 +810,31 @@ void WiFiScan::RunGPSInfo() {
       display_obj.tft.fillRect(0, (SCREEN_HEIGHT / 3) - 6, SCREEN_WIDTH, SCREEN_HEIGHT - ((SCREEN_HEIGHT / 3) - 6), TFT_BLACK);
 
       // Print the GPS data: 3
-      Serial.println("==== GPS Data ====");
       display_obj.tft.setCursor(0, SCREEN_HEIGHT / 3);
-      if (gps_obj.getFixStatus()) {
+      if (gps_obj.getFixStatus())
         display_obj.tft.println("  Good Fix: Yes");
-        Serial.println("  Good Fix: Yes");
-      }
-      else {
+      else
         display_obj.tft.println("  Good Fix: No");
-        Serial.println("  Good Fix: No");
-      }
+        
       display_obj.tft.println("Satellites: " + gps_obj.getNumSatsString());
       display_obj.tft.println("  Latitude: " + gps_obj.getLat());
       display_obj.tft.println(" Longitude: " + gps_obj.getLon());
       display_obj.tft.println("  Altitude: " + (String)gps_obj.getAlt());
       display_obj.tft.println("  Datetime: " + gps_obj.getDatetime());
-
-      // Display to serial
-      Serial.println("Satellites: " + gps_obj.getNumSatsString());
-      Serial.println("  Latitude: " + gps_obj.getLat());
-      Serial.println(" Longitude: " + gps_obj.getLon());
-      Serial.println("  Altitude: " + (String)gps_obj.getAlt());
-      Serial.println("  Datetime: " + gps_obj.getDatetime());
     #endif
+
+    // Display to serial
+    Serial.println("==== GPS Data ====");
+    if (gps_obj.getFixStatus())
+      Serial.println("  Good Fix: Yes");
+    else
+      Serial.println("  Good Fix: No");
+      
+    Serial.println("Satellites: " + gps_obj.getNumSatsString());
+    Serial.println("  Latitude: " + gps_obj.getLat());
+    Serial.println(" Longitude: " + gps_obj.getLon());
+    Serial.println("  Altitude: " + (String)gps_obj.getAlt());
+    Serial.println("  Datetime: " + gps_obj.getDatetime());
   #endif
 }
 
diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h
index 1bcb4cb..32c6ca8 100644
--- a/esp32_marauder/configs.h
+++ b/esp32_marauder/configs.h
@@ -114,7 +114,7 @@
     //#define HAS_NEOPIXEL_LED
     //#define HAS_PWR_MGMT
     //#define HAS_SCREEN
-    //#define HAS_GPS
+    #define HAS_GPS
     #ifndef WRITE_PACKETS_SERIAL
       #define HAS_SD
       #define USE_SD
@@ -764,14 +764,21 @@
   //// GPS STUFF
   #ifdef HAS_GPS
     #ifdef MARAUDER_V6
+      #define GPS_SERIAL_INDEX 2
       #define GPS_TX 4
       #define GPS_RX 13
     #elif defined(MARAUDER_V4)
+      #define GPS_SERIAL_INDEX 2
       #define GPS_TX 4
       #define GPS_RX 13
     #elif defined(MARAUDER_KIT)
+      #define GPS_SERIAL_INDEX 2
       #define GPS_TX 4
       #define GPS_RX 13
+    #elif defined(MARAUDER_FLIPPER)
+      #define GPS_SERIAL_INDEX 1
+      #define GPS_TX 9
+      #define GPS_RX 21
     #endif
   #endif
   //// END GPS STUFF