diff --git a/Makefile b/Makefile
index 3217a4c..59c24e2 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ ENABLE_WIDE_RX                   := 1
 ENABLE_TX_WHEN_AM                := 0
 # Frequency calibration 188 B
 ENABLE_F_CAL_MENU                := 0
-ENABLE_FM_DEV_CAL_MENU           := 0
+ENABLE_FM_DEV_CAL_MENU           := 1
 ENABLE_TX_UNLOCK_MENU            := 0
 #ENABLE_TX_POWER_CAL_MENU        := 0
 ENABLE_TX_POWER_FIX              := 1
diff --git a/driver/bk4819.c b/driver/bk4819.c
index 8665f78..2bdf4f1 100644
--- a/driver/bk4819.c
+++ b/driver/bk4819.c
@@ -1478,8 +1478,7 @@ void BK4819_set_CTCSS_freq(const uint32_t control_word)
 			( 0u <<  9) |     // Auto CDCSS BW Mode           1 = disable   0 = enable
 			( 0u <<  8) |     // Auto CTCSS BW Mode           1 = disable   0 = enable
 			( 0u <<  7) |     // ???
-//			(74u <<  0));     // CTCSS/CDCSS TX gain 1        0 ~ 127
-			(51u <<  0));
+			(51u <<  0));     // CTCSS/CDCSS TX gain 1        0 ~ 127
 	}
 
 	// REG_07 <15:0>
@@ -1524,8 +1523,7 @@ void BK4819_enable_CDCSS_tail(void)
 		( 0u <<  9) |     // Auto CDCSS BW Mode           1 = disable   0 = enable
 		( 0u <<  8) |     // Auto CTCSS BW Mode           1 = disable   0 = enable
 		( 0u <<  7) |     // ???
-//		(74u <<  0));     // CTCSS/CDCSS TX gain 1        0 ~ 127
-		(51u <<  0));
+		(51u <<  0));     // CTCSS/CDCSS TX gain 1        0 ~ 127
 }
 
 void BK4819_enable_CTCSS_tail(void)
@@ -1548,8 +1546,7 @@ void BK4819_enable_CTCSS_tail(void)
 		( 0u <<  9) |     // Auto CDCSS BW Mode           1 = disable   0 = enable
 		( 0u <<  8) |     // Auto CTCSS BW Mode           1 = disable   0 = enable
 		( 0u <<  7) |     // ???
-//		(74u <<  0));     // CTCSS/CDCSS TX gain 1        0 ~ 127
-		(51u <<  0));
+		(51u <<  0));     // CTCSS/CDCSS TX gain 1        0 ~ 127
 }
 
 uint16_t BK4819_GetRSSI(void)
diff --git a/firmware.bin b/firmware.bin
index 0c0163d..dc9b820 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 636da9b..01f60c9 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ
diff --git a/functions.c b/functions.c
index ec842c1..8e835cb 100644
--- a/functions.c
+++ b/functions.c
@@ -296,14 +296,14 @@ void FUNCTION_Select(function_type_t Function)
 				BK4819_set_scrambler(g_current_vfo->channel.scrambler);
 
 			// 1of11 .. TEST ONLY
-			if (g_current_vfo->p_tx->code_type == CODE_TYPE_NONE)
+//			if (g_current_vfo->p_tx->code_type == CODE_TYPE_NONE)
 			{
-				const uint16_t reg = BK4819_read_reg(0x2B);
-				#if 1
+//				const uint16_t reg = BK4819_read_reg(0x2B);
+				#if 0
 					BK4819_write_reg(0x2B, reg |  (1u << 2));   // disable the 300Hz TX HPF
 					//BK4819_write_reg(0x2B, reg |  (1u << 1));   // disable the TX LPF
 				#else
-					BK4819_write_reg(0x2B, reg & ~(1u << 2));   //  enable the 300Hz TX HPF
+//					BK4819_write_reg(0x2B, reg & ~(1u << 2));   //  enable the 300Hz TX HPF
 
 					// TX 300Hz LPF
 					//BK4819_write_reg(0x54, 0x935A);  // -3dB
@@ -333,10 +333,10 @@ void FUNCTION_Select(function_type_t Function)
 					  BK4819_write_reg(0x74, 52277);  // +4dB
 //				#endif
 			}
-			else
-			{
-				BK4819_write_reg(0x2B, BK4819_read_reg(0x2B) & ~(1u << 2));   // enable the 300Hz TX HPF
-			}
+//			else
+//			{
+//				BK4819_write_reg(0x2B, BK4819_read_reg(0x2B) & ~(1u << 2));   // enable the 300Hz TX HPF
+//			}
 
 			break;
 	}
diff --git a/settings.h b/settings.h
index fac17a8..03b25e8 100644
--- a/settings.h
+++ b/settings.h
@@ -26,11 +26,11 @@
 
 enum {
 	FM_DEV_LIMIT_LOWER_NARROW   =  700,
-	FM_DEV_LIMIT_DEFAULT_NARROW =  900,
-	FM_DEV_LIMIT_UPPER_NARROW   = 1500,   // 1100
+	FM_DEV_LIMIT_DEFAULT_NARROW = 1100,  // 900
+	FM_DEV_LIMIT_UPPER_NARROW   = 1500,
 
 	FM_DEV_LIMIT_LOWER_WIDE     =  900,
-	FM_DEV_LIMIT_DEFAULT_WIDE   = 1283,
+	FM_DEV_LIMIT_DEFAULT_WIDE   = 1300,
 	FM_DEV_LIMIT_UPPER_WIDE     = 1600
 };