diff --git a/Multiprotocol/DSM_cyrf6936.ino b/Multiprotocol/DSM_cyrf6936.ino
index e393f06..2fa3b90 100644
--- a/Multiprotocol/DSM_cyrf6936.ino
+++ b/Multiprotocol/DSM_cyrf6936.ino
@@ -142,86 +142,15 @@ static void __attribute__((unused)) DSM_update_channels()
 		ch_map[i]=pgm_read_byte_near(&DSM_ch_map_progmem[idx][i]);
 }
 
-static void __attribute__((unused)) DSM_getClonedMfgData()
-{
-	if(option&CLONE_BIT_MASK)
-	{ 
-		if(eeprom_read_byte((EE_ADDR)DSM_CLONE_EEPROM_OFFSET+4)==0xF0)
-		{
-			//read cloned ID from EEPROM
-			debugln("Using cloned ID");
-			uint16_t temp = DSM_CLONE_EEPROM_OFFSET;
-			for(uint8_t i=0;i<4;i++)
-				cyrfmfg_id[i] = eeprom_read_byte((EE_ADDR)temp++);
-		}
-		else
-		{
-			SUB_PROTO_INVALID;
-			debugln("No valid cloned ID");
-		}
-	}
-	else
-	{
-		SUB_PROTO_VALID;
-		CYRF_GetMfgData(cyrfmfg_id);
-	}
-	//Model match
-	cyrfmfg_id[3]^=RX_num;
-
-	//Calc sop_col
-	sop_col = (cyrfmfg_id[0] + cyrfmfg_id[1] + cyrfmfg_id[2] + 2) & 0x07;
-
-	//We cannot manipulate the ID if we are cloning
-	if(!(option&CLONE_BIT_MASK))
-	{	
-		//Fix for OrangeRX using wrong DSM_pncodes by preventing access to "Col 8"
-		if(sop_col==0 && sub_protocol != DSMR)
-		{
-		cyrfmfg_id[rx_tx_addr[0]%3]^=0x01;					//Change a bit so sop_col will be different from 0
-		sop_col = (cyrfmfg_id[0] + cyrfmfg_id[1] + cyrfmfg_id[2] + 2) & 0x07;
-		}
-	}
-
-	//Calc CRC seed
-	seed = (cyrfmfg_id[0] << 8) + cyrfmfg_id[1];
-
-	if(IS_SUB_PROTO_VALID)
-	{
-		debug("ID=")
-		for(uint8_t i=0;i<4;i++)
-			debug("%02x ", cyrfmfg_id[i]);
-		debugln("");
-	}
-
-	//Hopping frequencies
-	if (sub_protocol == DSMX_2F || sub_protocol == DSMX_1F)
-		DSM_calc_dsmx_channel();
-	else if(sub_protocol != DSMR)
-	{ 
-		uint8_t tmpch[10];
-		CYRF_FindBestChannels(tmpch, 10, 5, 3, 75);
-		//
-		uint8_t idx = random(0xfefefefe) % 10;
-		hopping_frequency[0] = tmpch[idx];
-		while(1)
-		{
-			idx = random(0xfefefefe) % 10;
-			if (tmpch[idx] != hopping_frequency[0])
-				break;
-		}
-		hopping_frequency[1] = tmpch[idx];
-	}
-
-	prev_option^=CLONE_BIT_MASK;				// reset the clone flag
-}
-
 static void __attribute__((unused)) DSM_build_data_packet(uint8_t upper)
 {
-	debugln("Opt = %02x", option);
 	uint8_t bits = 11;
 	// Check if clone flag has changed
 	if((prev_option&CLONE_BIT_MASK) != (option&CLONE_BIT_MASK))
-		DSM_getClonedMfgData();
+	{
+		DSM_init();
+		prev_option^=CLONE_BIT_MASK;
+	}
 	if(prev_option!=option)
 		DSM_update_channels();
 
@@ -588,16 +517,86 @@ const uint8_t PROGMEM DSMR_ID_FREQ[][4 + 23] = {
 
 void DSM_init()
 { 
-	if(sub_protocol == DSMR)
+	if((sub_protocol == DSMR))
 	{
-		uint8_t row = rx_tx_addr[3]%22;
-		for(uint8_t i=0; i< 4; i++)
-			cyrfmfg_id[i] = pgm_read_byte_near(&DSMR_ID_FREQ[row][i]);
-		for(uint8_t i=0; i< 23; i++)
-			hopping_frequency[i] = pgm_read_byte_near(&DSMR_ID_FREQ[row][i+4]);
+		if(option&CLONE_BIT_MASK)
+			SUB_PROTO_INVALID;
+		else
+		{
+			SUB_PROTO_VALID;
+			uint8_t row = rx_tx_addr[3]%22;
+			for(uint8_t i=0; i< 4; i++)
+				cyrfmfg_id[i] = pgm_read_byte_near(&DSMR_ID_FREQ[row][i]);
+			for(uint8_t i=0; i< 23; i++)
+				hopping_frequency[i] = pgm_read_byte_near(&DSMR_ID_FREQ[row][i+4]);
+		}
 	}
 	else
-		DSM_getClonedMfgData();
+	{
+		if(option&CLONE_BIT_MASK)
+		{ 
+			if(eeprom_read_byte((EE_ADDR)DSM_CLONE_EEPROM_OFFSET+4)==0xF0)
+			{
+				//read cloned ID from EEPROM
+				debugln("Using cloned ID");
+				uint16_t temp = DSM_CLONE_EEPROM_OFFSET;
+				for(uint8_t i=0;i<4;i++)
+					cyrfmfg_id[i] = eeprom_read_byte((EE_ADDR)temp++);
+				debug("Clone ID=")
+				for(uint8_t i=0;i<4;i++)
+					debug("%02x ", cyrfmfg_id[i]);
+				debugln("");
+			}
+			else
+			{
+				SUB_PROTO_INVALID;
+				debugln("No valid cloned ID");
+			}
+		}
+		else
+		{
+			SUB_PROTO_VALID;
+			CYRF_GetMfgData(cyrfmfg_id);
+		}
+	}
+	//Model match
+	cyrfmfg_id[3]^=RX_num;
+
+	//Calc sop_col
+	sop_col = (cyrfmfg_id[0] + cyrfmfg_id[1] + cyrfmfg_id[2] + 2) & 0x07;
+
+	//We cannot manipulate the ID if we are cloning
+	if(!(option&CLONE_BIT_MASK))
+	{	
+		//Fix for OrangeRX using wrong DSM_pncodes by preventing access to "Col 8"
+		if(sop_col==0 && sub_protocol != DSMR)
+		{
+		cyrfmfg_id[rx_tx_addr[0]%3]^=0x01;					//Change a bit so sop_col will be different from 0
+		sop_col = (cyrfmfg_id[0] + cyrfmfg_id[1] + cyrfmfg_id[2] + 2) & 0x07;
+		}
+	}
+
+	//Calc CRC seed
+	seed = (cyrfmfg_id[0] << 8) + cyrfmfg_id[1];
+
+	//Hopping frequencies
+	if (sub_protocol == DSMX_2F || sub_protocol == DSMX_1F)
+		DSM_calc_dsmx_channel();
+	else if(sub_protocol != DSMR)
+	{ 
+		uint8_t tmpch[10];
+		CYRF_FindBestChannels(tmpch, 10, 5, 3, 75);
+		//
+		uint8_t idx = random(0xfefefefe) % 10;
+		hopping_frequency[0] = tmpch[idx];
+		while(1)
+		{
+			idx = random(0xfefefefe) % 10;
+			if (tmpch[idx] != hopping_frequency[0])
+				break;
+		}
+		hopping_frequency[1] = tmpch[idx];
+	}
 
 	//
 	DSM_cyrf_config();
diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h
index 048592a..3fdbebd 100644
--- a/Multiprotocol/Multiprotocol.h
+++ b/Multiprotocol/Multiprotocol.h
@@ -19,7 +19,7 @@
 #define VERSION_MAJOR		1
 #define VERSION_MINOR		3
 #define VERSION_REVISION	3
-#define VERSION_PATCH_LEVEL	29
+#define VERSION_PATCH_LEVEL	30
 
 #define MODE_SERIAL 0
 
diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino
index a37f716..fae9502 100644
--- a/Multiprotocol/Multiprotocol.ino
+++ b/Multiprotocol/Multiprotocol.ino
@@ -719,7 +719,7 @@ void loop()
 				if(++count>10)
 				{ //The protocol does not leave enough time for an update so forcing it
 					count=0;
-					//debugln("Force update");
+					debugln("Force update");
 					Update_All();
 				}
 			}