 
 #endif  // HAYES
 
+#ifndef HAYES
+void ConfigureBaud()
+{
+  if (BAUD_RATE == 2400)
+  {
+      setBaud(9600,true);
+  }
+  else
+  {
+      setBaud(2400,true);
+  }
+}
+
+
+void setBaud(int newBaudRate, boolean pause) {
+  char temp[20];
+  BAUD_RATE = newBaudRate;
+  sprintf(temp,"New baud: %d",BAUD_RATE);
+  C64Println(temp);
+  C64Serial.flush();
+  delay(2);
+  C64Serial.end();
+  C64Serial.begin(BAUD_RATE);
+  C64Serial.setTimeout(1000);
+
+  WifiSerial.flush();
+  delay(2);
+  wifly.setBaud(newBaudRate);     // Uses set uart instant so no save and reboot needed
+  delay(1000);
+  WifiSerial.end();
+  WifiSerial.begin(newBaudRate);
+  
+  if (pause)
+    delay(5000);  // Delay 5 seconds so user has time to switch to help prevent junk...
+  //baudMismatch = (BAUD_RATE != WiFly_BAUD_RATE ? 1 : 0);
+
+  if (BAUD_RATE == 2400)
+    EEPROM.write(ADDR_BAUD, 0);  // Save  
+  else
+    EEPROM.write(ADDR_BAUD, 1);  // Save  
+}
+
+void setBaudWiFi(int newBaudRate, boolean pause) {
+  WifiSerial.flush();
+  delay(2);
+  wifly.setBaud(newBaudRate);     // Uses set uart instant so no save and reboot needed
+  delay(1000);
+  WifiSerial.end();
+  WifiSerial.begin(newBaudRate);
+}
+
+#endif HAYES
 
 int freeRam () 
 {

        C64Println(F("1. Display Current Configuration"));
        C64Println(F("2. Change SSID"));
        C64Println(F("3. Autostart Options"));
        C64Println(F("4. Direct Terminal Mode (Debug)"));
        C64Println(F("5. Return to Main Menu"));
        C64Println();
        C64Print(F("Select: "));


        Modem_Recovery++;
        EEPROM.write(ADDR_RECOVERY, Modem_Recovery);        
#endif  // HAYES

        // Always setup pins for flow control
        pinModeFast(C64_RTS, INPUT);
