             #ifdef USE_DIVERSITY
                             EEPROM.write(EEPROM_ADR_DIVERSITY,diversity_mode);
             #endif
-    
-            if (last_state!=STATE_SETUP_MENU   ) // if you didnt came from menu setup  save favorite
-            {
-                
+//            Serial.print ("last_state=");
+//            Serial.println (last_state);
+//            Serial.print ("state=");
+//            Serial.println (state);
+//             Serial.print ("STATE_FAVORITE=");
+//            Serial.println (STATE_FAVORITE);
+//             Serial.print ("state_last_used=");
+//            Serial.println (state_last_used);
+            
+            if (last_state!=STATE_SETUP_MENU  && state_last_used!=STATE_FAVORITE ) // if you didnt came from menu setup  save favorite
+            {
+                // Serial.println("bike sto vasiko");
                  if ( EEPROM.read(EEPROM_ADR_TUNE_FAV[10]) != 255) //ALL FAVS full gc9n
                   {
                     int lfav;

                    if (channelIndex > CHANNEL_MAX_INDEX)
                    {
                        channelIndex = CHANNEL_MIN_INDEX;
                    }
                    
                }
                  else
                {lfavs--;}

        wait_rssi_ready();
        rssi = readRSSI();
        rssi_best = (rssi > rssi_best) ? rssi : rssi_best;
        
//         //Serial.println ("---------------START");
         
         if (!RefreshFav)
         {
          HaveFav=false;
          for(int i = 1; i<=10; i++)
                {
                  //NoFav
//                      
                       Serial.print(i);
                       Serial.print  (" VALUE ");
                       Serial.println (EEPROM.read(EEPROM_ADR_TUNE_FAV[i]) );
                        
                      if (EEPROM.read(EEPROM_ADR_TUNE_FAV[i])!=255)
                      {  FirstFav=i;
                        HaveFav=true;
                        }
                }
                RefreshFav=true;
        //channel=channel_from_index(channelIndex); // get 0...48 index depending of current channel
         }

        if(state == STATE_FAVORITE) // MANUAL MODE
        { 
            // handling of keys
