diff --git a/nanovna.h b/nanovna.h
index c5313ea..1e661db 100644
--- a/nanovna.h
+++ b/nanovna.h
@@ -18,7 +18,7 @@
  */
 #include "ch.h"
 
-//#ifdef TINYSA_F303
+#ifdef TINYSA_F303
 #ifdef TINYSA_F072
 #error "Remove comment for #ifdef TINYSA_F303"
 #endif
@@ -26,7 +26,7 @@
 #define TINYSA4
 #endif
 #define TINYSA4_PROTO
-//#endif
+#endif
 
 #ifdef TINYSA_F072
 #ifdef TINYSA_F303
@@ -85,6 +85,7 @@
 #ifdef TINYSA3
 #define __HAS_DFU__
 #define __MCU_CLOCK_SHIFT__
+//#define __HAM_BAND__
 #endif
 #ifdef TINYSA4
 #define __BANDS__
diff --git a/plot.c b/plot.c
index d4dfbbb..d20fc36 100644
--- a/plot.c
+++ b/plot.c
@@ -199,16 +199,20 @@ const ham_bands_t ham_bands[] =
   {222000000, 225000000},
   {420000000, 450000000},
   {902000000, 928000000},
+#ifdef TINYSA4
   {1240000000,1300000000},
   {2300000000, 2310000000},
   {2390000000, 2450000000},
   {3300000000, 3500000000},
   {5650000000, 5925000000},
   {10000000000, 10500000000}
-
+#endif
 };
-
+#ifdef TINYSA4
 const int ham_band_max = 24;
+#else
+const int ham_band_max = 18;
+#endif
 
 int ham_band(int x)      // Search which index in the frequency tabled matches with frequency  f using actual_rbw
 {
diff --git a/sa_core.c b/sa_core.c
index cc899b3..f4e6ff7 100644
--- a/sa_core.c
+++ b/sa_core.c
@@ -671,7 +671,9 @@ void reset_settings(int m)
   setting.trigger_mode = T_MID;
   setting.fast_speedup = 0;
   setting.trigger_level = -150.0;
+#ifdef __TRIGGER_TRACE__
   setting.trigger_trace = 255;
+#endif
   setting.linearity_step = 0;
 //  setting.refer = -1;             // do not reset reffer when switching modes
   setting.mute = true;
@@ -1966,7 +1968,9 @@ void set_external_gain(float external_gain)
 void set_trigger_level(float trigger_level)
 {
   setting.trigger_level = trigger_level;
+#ifdef  __TRIGGER_TRACE__
   setting.trigger_trace = 255;
+#endif
   redraw_request |= REDRAW_TRIGGER | REDRAW_CAL_STATUS | REDRAW_AREA;
   //dirty = true;             // No HW update required, only status panel refresh
 }
@@ -5268,8 +5272,14 @@ static volatile int dummy;
 #endif
 
       if (MODE_INPUT(setting.mode)) {
-        if ((setting.trigger_trace == 255 && RSSI >= setting.trigger_level) ||
-            ( setting.trigger_trace != 255 && RSSI >= measured[setting.trigger_trace][i]))
+        if (
+#ifdef __TRIGGER_TRACE__
+            (setting.trigger_trace == 255 && RSSI >= setting.trigger_level) ||
+            ( setting.trigger_trace != 255 && RSSI >= measured[setting.trigger_trace][i])
+#else
+            (RSSI >= setting.trigger_level)
+#endif
+            )
         {
           triggered = true;
 #ifdef __BEEP__