diff --git a/app/app.c b/app/app.c
index 684884e..4279eaa 100644
--- a/app/app.c
+++ b/app/app.c
@@ -660,7 +660,7 @@ static void MR_NextChannel(void)
 					if (RADIO_CheckValidChannel(chan1, false, 0))
 					{
 						gCurrentScanList = SCAN_NEXT_CHAN_SCANLIST1;
-						gNextMrChannel = chan1;
+						gNextMrChannel   = chan1;
 						break;
 					}
 				}
@@ -1079,14 +1079,14 @@ void APP_Update(void)
 			if (gCurrentFunction == FUNCTION_INCOMING)
 				APP_StartListening(gMonitor ? FUNCTION_MONITOR : FUNCTION_RECEIVE, true);
 			else
-				FREQ_NextChannel();
+				FREQ_NextChannel();  // switch to next frequency
 		}
 		else
 		{
 			if (gCurrentCodeType == CODE_TYPE_OFF && gCurrentFunction == FUNCTION_INCOMING)
 				APP_StartListening(gMonitor ? FUNCTION_MONITOR : FUNCTION_RECEIVE, true);
 			else
-				MR_NextChannel();
+				MR_NextChannel();    // switch to next channel
 		}
 
 		gScanPauseMode      = false;
diff --git a/board.c b/board.c
index 259b0a5..a632726 100644
--- a/board.c
+++ b/board.c
@@ -687,7 +687,8 @@ void BOARD_EEPROM_Init(void)
 	
 	// 0F18..0F1F
 	EEPROM_ReadBuffer(0x0F18, Data, 8);
-	gEeprom.SCAN_LIST_DEFAULT = (Data[0] < 2) ? Data[0] : false;
+//	gEeprom.SCAN_LIST_DEFAULT = (Data[0] < 2) ? Data[0] : false;
+	gEeprom.SCAN_LIST_DEFAULT = (Data[0] < 3) ? Data[0] : false;  // we now have 'all' channel scan option
 	for (i = 0; i < 2; i++)
 	{
 		const unsigned int j = 1 + (i * 3);
diff --git a/firmware.bin b/firmware.bin
index a6a9476..56821b4 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index d847bb8..3c786dc 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ