diff --git a/GB3TX/GB3TX.ino b/GB3TX/GB3TX.ino
index de258a5..92cfc81 100644
--- a/GB3TX/GB3TX.ino
+++ b/GB3TX/GB3TX.ino
@@ -107,7 +107,7 @@ void loop() {
     if (millis() - tot >= TIMEOUT && (myrpt->state == TT || myrpt->state == GW)) {
       serial_writer(&myrpt->serial, "REPEATER: TIMEOUT");
       myrpt->state = TIMEOUT;
-      tone(3, 440, 1000);
+      tone(PIP, 440, 1000);
       delay(1000);
     }
 
diff --git a/GB3TX/cw.ino b/GB3TX/cw.ino
index b48e2c4..6b6b794 100644
--- a/GB3TX/cw.ino
+++ b/GB3TX/cw.ino
@@ -24,14 +24,14 @@ void sendChar(int speed, int pitch, char c) {
       if (dd == 1) {
         return;
       }
-      tone(3, pitch);
+      tone(PIP, pitch);
       if (dd&1) {
         delay(speed * 3);
       } else {
         delay(speed);   
       }
       dd >>= 1;
-      noTone(3);
+      noTone(PIP);
       delay(speed);
   }
 }
diff --git a/GB3TX/repeater.ino b/GB3TX/repeater.ino
index feee6fb..5f4f090 100644
--- a/GB3TX/repeater.ino
+++ b/GB3TX/repeater.ino
@@ -39,7 +39,7 @@ bool busy(repeater* myrpt) {
 void courtesyTone(repeater* myrpt) {
   switch(myrpt->params.courtesy) {
     case TONE:
-      myrpt->last == TT ? tone(3, myrpt->params.pip_pitch, myrpt->params.pip_length) : tone(3, myrpt->params.pip_gw_pitch, myrpt->params.pip_gw_length);
+      myrpt->last == TT ? tone(PIP, myrpt->params.pip_pitch, myrpt->params.pip_length) : tone(PIP, myrpt->params.pip_gw_pitch, myrpt->params.pip_gw_length);
       break;
     case CW:
       myrpt->last == TT ? sendChar(myrpt->params.pip_speed,myrpt->params.pip_pitch,myrpt->params.pip_letter) : sendChar(myrpt->params.pip_speed,myrpt->params.pip_gw_pitch, myrpt->params.pip_gw_letter);