             //char inbound = toupper(_serial->read());
             char inbound = C64Serial.read();
 
-            if (Modem_Echo)
+            if (Modem_EchoOn)
             {
                 if (!Modem_flowControl) 
                     delay(100/(BAUD_RATE/2400));         // Slow down command mode to prevent garbage if flow control 

    
    while (wifly.available() != -1) // -1 means closed
    {
        if (0) {   // Assumes host is slower than WiFly
        //if (baudMismatch) {   // Assumes host is slower than WiFly
            while (wifly.available() > 0)
            {
                digitalWriteFast(WIFI_CTS, HIGH);     // ..stop data from Wi-Fi

// Misc Values
#define TIMEDOUT  -1
boolean baudMismatch = (BAUD_RATE != WiFly_BAUD_RATE ? 1 : 0);
boolean Modem_flowControl = false;   // for &K setting.  Not currently stored in EEPROM

// EEPROM Addresses
#define ADDR_PETSCII       0
#define ADDR_AUTOSTART     1
#define ADDR_BAUD_LO       2
#define ADDR_BAUD_HI       3
//#define ADDR_MODEM_ECHO    10

// PETSCII state
boolean petscii_mode = EEPROM.read(ADDR_PETSCII);
