diff --git a/ubitx_20/cat_libs.ino b/ubitx_20/cat_libs.ino
index c5c1183..70e2422 100644
--- a/ubitx_20/cat_libs.ino
+++ b/ubitx_20/cat_libs.ino
@@ -58,17 +58,18 @@
  */
 void iopSendMode(char cw_mode, char is_usb, char digi_mode)
 {
-  byte mode;
-  
+  rig_mode mode;
+
+  // NOTE: eventually, add sideband (is_usb) to all of these.
   if (cw_mode > 0) {
-    mode = (cw_mode == 1 ? cwr : cw);
+    mode = rig_mode::cw;  
   } else if (digi_mode > 0) {
     //mode = (is_usb ? RIG_MODE_DGU : RIG_MODE_DGL);
-    mode = dig;
+    mode = rig_mode::digi;
 //  } else if (is_test) {
 //    mode = (is_usb ? RIG_MODE_TTU : RIG_MODE_TTL);
   } else {
-    mode = (is_usb ? usb : lsb);
+    mode = rig_mode::ssb; //(is_usb ? usb : lsb);
   }
   sendIOPModeCommand(mode);
 }