         } else if (strcmp(sms_buffer, "Status") == 0) {
           Serial.print(F("  Responding with status..."));
 
-          char sms_response[16];
-          uint16_t vbat;
-          fona.getBattVoltage(&vbat);
-
-          uint8_t rssi = fona.getRSSI();
-          sprintf (sms_response, "%d bars,\n%d mV", barsFromRSSI(rssi), vbat);
-
-          // reply...
-          if (fona.sendSMS(MY_PHONE_NUMBER, sms_response)) {
+          if (fonaSendStatusSMS(MY_PHONE_NUMBER)) {
             Serial.println(F(" sent."));
           } else {
             Serial.println(F(" failed!"));

    if (network_status == 1 || network_status == 5) break;
    delay(250);
  }
  Serial.println(F(" done."));

  // Attach the RI interrupt

        if (strcmp(sms_buffer, "Location") == 0) {
          Serial.print(F("  Responding with location..."));

          if (fonaSendLocationSMS(MY_PHONE_NUMBER)) {
            Serial.println(F(" sent."));
          } else {
            Serial.println(F(" failed!"));
