         byte a = BAUD_RATE / 256;
         byte b = BAUD_RATE % 256;
 
-        updateEEPROM(ADDR_BAUD_LO,a);
-        updateEEPROM(ADDR_BAUD_HI,b);
+        updateEEPROMByte(ADDR_BAUD_LO,a);
+        updateEEPROMByte(ADDR_BAUD_HI,b);
     }
 
     //setBaud(BAUD_RATE, false, true);

            Modem_PrintOK();
        else
            Modem_PrintERROR();
    }
    else if (strncmp(Modem_CommandBuffer, ("AT"), 2) == 0)
    {

            Modem_PrintERROR();
        }
    }
    else if (strncmp(Modem_CommandBuffer, ("ATD#"), 4) == 0)
    {
        // Phonebook dial
        char numString[2];
        numString[0] = Modem_CommandBuffer[4];
        numString[1] = '\0';
        char address[ADDR_HOST_SIZE];
        
        int phoneBookNumber = atoi(numString);
        if (phoneBookNumber >= 1 && phoneBookNumber <= 5)
        {
            strncpy(address,readEEPROMPhoneBook(ADDR_HOSTS + ((phoneBookNumber-1) * ADDR_HOST_SIZE)).c_str(),ADDR_HOST_SIZE);
            Modem_Dialout(address);
        }
        else
            Modem_PrintERROR();
    }
    else if (   // This needs to be revisited
        strncmp(Modem_CommandBuffer, ("ATDT "), 5) == 0 ||
        strncmp(Modem_CommandBuffer, ("ATDP "), 5) == 0 ||
