diff --git a/lighthub/abstractout.h b/lighthub/abstractout.h
index c1279db..41417a8 100644
--- a/lighthub/abstractout.h
+++ b/lighthub/abstractout.h
@@ -8,7 +8,7 @@ class chPersistent {};
 class abstractOut  : public abstractCh{
 public:
     abstractOut(Item * _item):abstractCh(){item=_item;};
-    virtual int Ctrl(itemCmd cmd,  char* subItem=NULL) =0;
+    virtual int Ctrl(itemCmd cmd,  char* subItem=NULL, bool toExecute=true) =0;
     virtual int isActive(){return 0;};
     virtual int getDefaultOnVal(){return 100;};
     virtual int getChanType(){return 0;}
diff --git a/lighthub/colorchannel.cpp b/lighthub/colorchannel.cpp
index 312f685..6ef5278 100644
--- a/lighthub/colorchannel.cpp
+++ b/lighthub/colorchannel.cpp
@@ -16,16 +16,30 @@ short colorChannel::getChannelAddr(short n)
   return item->getArg(n);
 }
 
-int colorChannel::Ctrl(itemCmd cmd, char* subItem)
+int colorChannel::Ctrl(itemCmd cmd, char* subItem, bool toExecute)
 {
-
-int chActive = item->isActive();
-bool toExecute = (chActive>0); // execute if channel is active now
+debugSerial<<F("clrCtr: ");
+cmd.debugOut();
+//int chActive = item->isActive();
+//bool toExecute = (chActive>0); // execute if channel is active now
 int suffixCode = cmd.getSuffix();
-itemCmd st(ST_HSV,CMD_VOID);
+/*
+// Since this driver working both, for single-dimmed or PWM channel and color - define storage type
+uint8_t storageType;
+switch (getChanType())
+{
+  case CH_RGB:
+  case CH_RGBW:
+  storageType=ST_HSV;
+  break;
+  default:
+  storageType=ST_PERCENTS;
+}
+itemCmd st(storageType,CMD_VOID);
 
 if (!suffixCode) toExecute=true; //forced execute if no suffix
 if (cmd.isCommand() && !suffixCode) suffixCode=S_CMD; //if some known command recognized , but w/o correct cmd suffix - threat it as command
+*/
 
 switch(suffixCode)
 {
@@ -34,62 +48,32 @@ case S_NOTFOUND:
 toExecute = true;
 case S_SET:
 case S_HSV:
-          st.loadItem(item);
-          st.assignFrom(cmd);
-          PixelCtrl(st, subItem, toExecute);
-          st.saveItem(item);
-
-          if (!suffixCode)
-          {
-            if (chActive>0 && !st.getPercents()) item->setCmd(CMD_OFF);
-            if (chActive==0 && st.getPercents()) item->setCmd(CMD_ON);
-            item->SendStatus(SEND_COMMAND | SEND_PARAMETERS | SEND_DEFFERED);
-          }
-          else    item->SendStatus(SEND_PARAMETERS | SEND_DEFFERED);
+          PixelCtrl(cmd, subItem, toExecute);
           return 1;
-/*
-case S_HUE:
-     st.setH(uint16_t);
-     break;
-
-case S_SAT:
-     st.setS(uint8_t);
-     break;
-*/
 case S_CMD:
       item->setCmd(cmd.getCmd());
       switch (cmd.getCmd())
           {
           case CMD_ON:
-           //retrive stored values
-           if (st.loadItem(item))
-            {
-            if (st.param.aslong && (st.param.v<MIN_VOLUME)) {
-                                                            st.Percents(INIT_VOLUME);
-                                                            }
-
-              debugSerial<<F("Restored: ")<<st.param.h<<F(",")<<st.param.s<<F(",")<<st.param.v<<endl;
-           }
-            else // Not restored
-            {
-              st.setDefault();
-              debugSerial<<st.param.aslong<<F(": No stored values - default\n");
-            }
-
-            st.saveItem(item, true);
-            PixelCtrl(st);
+            PixelCtrl(cmd,subItem, true);
             item->SendStatus(SEND_COMMAND | SEND_PARAMETERS );
             return 1;
 
             case CMD_OFF:
-              st.Percents(0);
-              PixelCtrl(st, subItem, true);
+              cmd.Percents(0);
+              PixelCtrl(cmd, subItem, true);
               item->SendStatus(SEND_COMMAND);
             return 1;
+
+            default:
+            debugSerial<<F("Unknown cmd ")<<cmd.getCmd()<<endl;
           } //switch cmd
+
+    default:
+  debugSerial<<F("Unknown suffix ")<<suffixCode<<endl;
 } //switch suffix
 
-debugSerial<<F("Unknown cmd")<<endl;
+cmd.debugOut();
 return 0;
 
 }
diff --git a/lighthub/colorchannel.h b/lighthub/colorchannel.h
index 42a19b1..a5b18bd 100644
--- a/lighthub/colorchannel.h
+++ b/lighthub/colorchannel.h
@@ -14,7 +14,7 @@ public:
                           if (iaddr<0) iaddr=-iaddr;
                           numArgs = item->getArgCount(); // and how many addresses is configured
                         };
-    int Ctrl(itemCmd cmd, char* subItem=NULL) override;
+    int Ctrl(itemCmd cmd, char* subItem=NULL, bool toExecute=true) override;
     virtual int PixelCtrl(itemCmd cmd, char* subItem=NULL, bool show=true ) =0;
     short getChannelAddr(short n =0);
 protected:
diff --git a/lighthub/inputs.cpp b/lighthub/inputs.cpp
index cc43cd6..6893ccb 100644
--- a/lighthub/inputs.cpp
+++ b/lighthub/inputs.cpp
@@ -23,7 +23,7 @@ e-mail    anklimov@gmail.com
 #include "utils.h"
 #include <PubSubClient.h>
 #include "main.h"
-#include "itemCmd.h""
+#include "itemCmd.h"
 
 #ifndef DHT_DISABLE
 #if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
diff --git a/lighthub/item.cpp b/lighthub/item.cpp
index 4496aef..0de8219 100644
--- a/lighthub/item.cpp
+++ b/lighthub/item.cpp
@@ -354,7 +354,7 @@ void Item::setSubtype(uint8_t par)  // Only store if VAL is int (autogenerated o
 {
     if (!itemVal || itemVal->type != aJson_Int) return;
     //debugSerial<<F(" Store ")<<F(" Val=")<<par<<endl;
-    itemVal->subtype = par;
+    itemVal->subtype = par & 0xF;
 }
 
 long int Item::getExt() //Return Val if val is int or first elem of Value array
@@ -450,7 +450,7 @@ int Item::Ctrl(char * payload, char * subItem)
 {
 if (!payload) return 0;
 
-itemCmd st(ST_VOID,CMD_VOID);
+
 int   suffixCode = 0;
 
 if ((!subItem || !strlen(subItem)) && strlen(defaultSubItem))
@@ -462,19 +462,23 @@ if (subItem && strlen(subItem))
 if (!suffixCode && defaultSuffixCode)
         suffixCode = defaultSuffixCode;
 
-st.setSuffix(suffixCode);
 
 int i=0;
 while (payload[i]) {payload[i]=toupper(payload[i]);i++;};
 
 int cmd = txt2cmd(payload);
 debugSerial<<F("Txt2Cmd:")<<cmd<<endl;
-st.Cmd(cmd);
+
+itemCmd st(ST_VOID,cmd);
+st.setSuffix(suffixCode);
 
   switch (cmd) {
-      case CMD_HSV: st.Cmd(0);
       case CMD_UP:
       case CMD_DN:
+          st.Int((int32_t)getInt((char **) &payload));
+          return   Ctrl(st,subItem);
+      break;
+      case CMD_HSV: st.Cmd(0);
       case CMD_VOID:
        {
          //Parsing integers from payload
@@ -483,16 +487,25 @@ st.Cmd(cmd);
           while (payload && i < 3)
               Par[i++] = getInt((char **) &payload);
 
-          switch (i) //Number of params
-          {
-            case 1: st.Percents(Par[0]);
-            break;
-            case 2: st.setH(Par[0]);
-                    st.setS(Par[0]);
-            break;
-            case 3: st.HSV(Par[0],Par[1],Par[2]);
-            default:;
-          }
+              switch(suffixCode)
+              {case S_HUE:
+                      st.setH(Par[0]);
+                      break;
+               case S_SAT:
+                      st.setS(Par[0]);
+                      break;
+                default:
+                    switch (i) //Number of params
+                    {
+                      case 1: st.Percents(Par[0]);
+                      break;
+                      case 2: st.setH(Par[0]);
+                              st.setS(Par[0]);
+                      break;
+                      case 3: st.HSV(Par[0],Par[1],Par[2]);
+                      default:;
+                    }
+              }
           //return   Ctrl(setCommand, i, Par,  suffixCode, subItem);
           return   Ctrl(st,subItem);
       }
@@ -503,7 +516,7 @@ st.Cmd(cmd);
           break;
       case CMD_RGB: //RGB color in #RRGGBB notation
 
-      {
+      {  st.Cmd(0);
         //Parsing integers from payload
          short i = 0;
          int Par[4];
@@ -527,17 +540,6 @@ st.Cmd(cmd);
 return 0;
 }
 
-/*
-short Item::cmd2changeActivity(int lastActivity, short defaultCmd)
-{
-  if  (isActive())
-     if (lastActivity) return defaultCmd;
-     else return CMD_ON;
-  else if (lastActivity) return CMD_OFF;
-       else return defaultCmd;
-}
-*/
-
 int Item::Ctrl(itemCmd cmd,  char* subItem)
 {
   char stringBuffer[16];
@@ -554,10 +556,9 @@ int Item::Ctrl(itemCmd cmd,  char* subItem)
         suffixCode = defaultSuffixCode;
 
 
-    debugSerial<<F("RAM=")<<freeRam()<<F(" Item=")<<itemArr->name<<F(" Sub=")<<subItem<<F(" Suff=")<<suffixCode<<F(" Cmd=")<<cmd.getCmd()<<F(" Par=")<<cmd.toString(stringBuffer, sizeof(stringBuffer));
+    debugSerial<<F("RAM=")<<freeRam()<<F(" Item=")<<itemArr->name<<F(" Sub=")<<subItem<<F(" Suff=")<<suffixCode<<F(" Cmd=")<<cmd.getCmd()<<F(" Par=")<<cmd.toString(stringBuffer, sizeof(stringBuffer))<<endl;
     if (!itemArr) return -1;
 
-
           if (itemType != CH_GROUP )
           {
           //Check if subitem is some sort of command
@@ -572,19 +573,31 @@ int Item::Ctrl(itemCmd cmd,  char* subItem)
           // Group channel
           if (! operation) return -1;
 
-          //int     iaddr = getArg();
-          bool    chActive =(isActive()>0);
+          bool    chActive  = (isActive()>0);
+          bool    toExecute = (chActive>0); // execute if channel is active now
 
           itemCmd st(ST_VOID,CMD_VOID);
-          st.loadItem(this); //Restore previous channel state to "st"
 
-          //threating Toggle, Restore, XOFF special conditional commands/ convert to ON, OFF
+           //Restore previous channel state to "st"
+           //if no values - set default values, save and put to MQTT
+           if (!st.loadItem(this))
+                                    {
+                                    debugSerial<<F("No stored values - default: ");
+                                    st.setChanType(getChanType());
+                                    st.setDefault();
+                                    st.saveItem(this);
+                                    st.debugOut();
+                                    SendStatus(SEND_PARAMETERS | SEND_DEFFERED);
+                                    }
 
+          //threating Toggle, Restore, XOFF (special conditional commands)/ convert to ON, OFF and SET values
           switch (cmd.getCmd()) {
               int t;
               case CMD_TOGGLE:
-                  if (chActive) cmd.Cmd(CMD_OFF);
-                      else cmd.Cmd(CMD_ON);
+                  toExecute=true;
+                  if (chActive) st.Cmd(CMD_OFF);
+                      else st.Cmd(CMD_ON);
+                  cmd.Cmd(st.getCmd()); // For GROUP control
                   break;
 
               case CMD_RESTORE:
@@ -592,22 +605,25 @@ int Item::Ctrl(itemCmd cmd,  char* subItem)
                       switch (t = getCmd()) {
                           case CMD_HALT: //previous command was HALT ?
                               debugSerial << F("Restored from:") << t << endl;
-                              if (itemType == CH_THERMO) cmd.Cmd(CMD_AUTO);
-                                  else cmd.Cmd(CMD_ON);    //turning on
+                              toExecute=true;
+                              if (itemType == CH_THERMO) st.Cmd(CMD_AUTO);
+                                  else st.Cmd(CMD_ON);    //turning on
                               break;
                           default:
                               return -3;
                       }
+
                   break;
               case CMD_XOFF:
                   if (itemType != CH_GROUP) //individual threating of channels. Ignore restore command for groups
                       switch (t = getCmd()) {
                           case CMD_XON: //previous command was CMD_XON ?
                               debugSerial << F("Turned off from:") << t << endl;
-                              cmd.Cmd(CMD_OFF);    //turning Off
+                              toExecute=true;
+                              st.Cmd(CMD_OFF);    //turning Off
                               break;
                           default:
-                              debugSerial<<F("XOFF skipped. Prev cmd:")<<t<<endl;
+                              debugSerial << F("XOFF skipped. Prev cmd:") << t <<endl;
                             return -3;
 
                     }
@@ -615,49 +631,82 @@ int Item::Ctrl(itemCmd cmd,  char* subItem)
             case CMD_DN:
             case CMD_UP:
             {
-            if (itemType == CH_GROUP) break; ////bug here
-
+            //if (itemType == CH_GROUP) break; ////bug here
+            st.Cmd(CMD_VOID); // Converting to SET value command
             short step=0;
             if (cmd.isValue()) step=cmd.getInt();
             if (!step) step=DEFAULT_INC_STEP;
             if (cmd.getCmd() == CMD_DN) step=-step;
 
-            //int cType=getChanType();
-            //debugSerial<<"from: h="<<st.h<<" s="<<st.s <<" v="<<st.v<<endl;
                       switch (suffixCode)
                       {
                         case S_NOTFOUND:
+                             toExecute=true;
                         case S_SET:
-                             st.incrementPercents(step);
+                             if (st.incrementPercents(step))
+                             {
+                               st.saveItem(this);
+                               SendStatus(SEND_PARAMETERS | SEND_DEFFERED);
+                             }
                         break;
                         case S_HUE:
-                             st.incrementH(step);
+                             if (st.incrementH(step))
+                             {
+                             st.saveItem(this);
+                             SendStatus(SEND_PARAMETERS | SEND_DEFFERED);
+                             }
                              break;
                         case S_SAT:
-                             st.incrementS(step);
+                             if (st.incrementS(step))
+                             {
+                             st.saveItem(this);
+                             SendStatus(SEND_PARAMETERS | SEND_DEFFERED);
+                             }
                       } //switch suffix
 
              } //Case UP/DOWN
              break;
-             case CMD_VOID:
-                         //if (itemType == CH_GROUP || n!=1) break;
+             case CMD_VOID: // No commands, just set value
+                         ////if (itemType == CH_GROUP ) break; ////
                          if (!cmd.isValue()) break;
 ////                         if ( cType == CH_RGB || cType == CH_RGBW || cType == CH_GROUP )
                                switch (suffixCode)
-                               {     case S_SET:
-                                     case S_NOTFOUND:
+                               {
+                                     case S_NOTFOUND: //For empty (universal) suffix - turn ON/OFF automatically
+                                     toExecute=true;
+                                     if (chActive>0 && !cmd.getPercents()) st.Cmd(CMD_OFF);
+                                     if (chActive==0 && cmd.getPercents()) st.Cmd(CMD_ON);
+                                     setCmd(st.getCmd());
+                                     SendStatus(SEND_COMMAND | SEND_DEFFERED);
+
+                                     // continue processing as SET
+                                     case S_SET:
                                      st.assignFrom(cmd);
+                                     st.saveItem(this);
+                                     SendStatus(SEND_PARAMETERS | SEND_DEFFERED);
+
                                      break;
                                      case S_SAT:
-                                     st.setS(cmd.getInt());
-                                     st.saveItem(this);
+                                     if (st.setS(cmd.getS()))
+                                        {
+                                          st.saveItem(this);
+                                          SendStatus(SEND_PARAMETERS | SEND_DEFFERED);
+                                        }
                                      break;
 
                                      case S_HUE:
-                                     st.setH(cmd.getInt());
-                                     st.saveItem(this);
+                                     if (st.setH(cmd.getH()))
+                                        {
+                                          st.saveItem(this);
+                                          SendStatus(SEND_PARAMETERS | SEND_DEFFERED);
+                                        }
                                    }
 
+                                  break;
+
+          default:
+                st.Cmd(cmd.getCmd());
+                toExecute=true;
           } //Switch commands
 
 //==================
@@ -671,8 +720,9 @@ if (driver) //New style modular code
             if (!chActive>0)  //if channel was'nt active before CMD_XON
                   {
                     debugSerial<<F("Turning XON\n");
-                    res = driver->Ctrl(cmd.Cmd(CMD_ON), subItem);
+                    res = driver->Ctrl(st.Cmd(CMD_ON), subItem);
                     setCmd(CMD_XON);
+                    SendStatus(SEND_COMMAND);
                   }
               else
               {  //cmd = CMD_ON;
@@ -683,8 +733,9 @@ if (driver) //New style modular code
             case CMD_HALT:
             if (chActive>0)  //if channel was active before CMD_HALT
                   {
-                    res = driver->Ctrl(cmd.Cmd(CMD_OFF), subItem);
+                    res = driver->Ctrl(st.Cmd(CMD_OFF), subItem);
                     setCmd(CMD_HALT);
+                    SendStatus(SEND_COMMAND);
                     return res;
                   }
             else
@@ -696,8 +747,9 @@ if (driver) //New style modular code
             case CMD_OFF:
             if (getCmd() != CMD_HALT) //Halted, ignore OFF
                  {
-                   res = driver->Ctrl(cmd.Cmd(CMD_OFF), subItem);
+                   res = driver->Ctrl(st.Cmd(CMD_OFF), subItem);
                    setCmd(CMD_OFF);
+                   SendStatus(SEND_COMMAND);
                  }
             else
                   {
@@ -707,41 +759,48 @@ if (driver) //New style modular code
             break;
 
             case CMD_VOID:
-            res = driver->Ctrl(st, subItem);
+            res = driver->Ctrl(st, subItem, toExecute);
             break;
 
             default: //another command
-            res = driver->Ctrl(cmd, subItem);
-            if (cmd.isCommand()) setCmd(cmd.getCmd());
+            res = driver->Ctrl(st, subItem);
+            if (st.isCommand())
+                        {
+                        setCmd(st.getCmd());
+                        SendStatus(SEND_COMMAND);
+                        }
           }
           return res;
         }
-
+else //Driver not found
 //==================
+{
 switch (itemType) {
-          case CH_GROUP://Group
-          {
-              if (itemArg->type == aJson_Array) {
-                  aJsonObject *i = itemArg->child;
-                  configLocked++;
-                  while (i) {
-                      if (i->type == aJson_String)
-                        {
-                        Item it(i->valuestring);
-                        it.Ctrl(cmd,subItem);
-                        }
-                      i = i->next;
-                  } //while
-                  configLocked--;
-              } //if
-          } //case
+                case CH_GROUP:
+                {
+                    if (itemArg->type == aJson_Array) {
+                        aJsonObject *i = itemArg->child;
+                        configLocked++;
+                        while (i) {
+                            if (i->type == aJson_String)
+                              {
+                              Item it(i->valuestring);
+                              it.Ctrl(cmd,subItem);
+                              }
+                            i = i->next;
+                        } //while
+                        configLocked--;
+                    } //if
+                } //case
+               break;
+
+
 
 // rest of Legacy monolite core code (to be refactored )
-
               case CH_RELAY:
-        {
+              {
                  short iaddr=getArg();
-                 short icmd =cmd.getCmd();
+                 short icmd =st.getCmd();
 
                  if (iaddr)
                  {
@@ -752,704 +811,47 @@ switch (itemType) {
                       iaddr = -iaddr;
                       inverse = 1;
                   }
-                  pinMode(iaddr, OUTPUT);
+                  if (iaddr <=PINS_COUNT && iaddr>0)
+                      {
+                      pinMode(iaddr, OUTPUT);
 
-                  if (inverse)
-                      digitalWrite(iaddr, k = ((icmd == CMD_ON || icmd == CMD_XON) ? LOW : HIGH));
-                  else
-                      digitalWrite(iaddr, k = ((icmd == CMD_ON || icmd == CMD_XON) ? HIGH : LOW));
-                  debugSerial<<F("Pin:")<<iaddr<<F("=")<<k<<endl;
-                  break;
+                      if (inverse)
+                          digitalWrite(iaddr, k = ((icmd == CMD_ON || icmd == CMD_XON) ? LOW : HIGH));
+                      else
+                          digitalWrite(iaddr, k = ((icmd == CMD_ON || icmd == CMD_XON) ? HIGH : LOW));
+                      debugSerial<<F("Pin:")<<iaddr<<F("=")<<k<<endl;
+                      }
                 }
-      }
+                   break;
+              }
 
-      case CH_THERMO:
+              case CH_THERMO:
                       ///thermoSet(name,cmd,Par1); all activities done - update temp & cmd
-                  break;
+                   break;
 
 
       #ifndef MODBUS_DISABLE
               case CH_MODBUS:
-                  modbusDimmerSet(cmd.getPercents());
+                  modbusDimmerSet(st.getPercents());
                   break;
               case CH_VC:
-                  VacomSetFan(cmd.getPercents(), cmd.getCmd());
+                  VacomSetFan(st.getPercents(), st.getCmd());
                   break;
-              case CH_VCTEMP: {
-                  VacomSetHeat(cmd.getPercents(), cmd.getCmd());
+              case CH_VCTEMP:
+                  VacomSetHeat(st.getPercents(), st.getCmd());
                   break;
-              }
-      #endif
+
+     #endif
   } //switch
-
+  if (st.isCommand())
+              {
+              setCmd(st.getCmd());
+              SendStatus(SEND_COMMAND);
+              }
+ }
 }
 
 
-/* RIP
-int Item::Ctrl(short cmd, short n, int *Parameters,  int suffixCode, char *subItem) {
-bool send = isNotRetainingStatus() ;
-  if ((!subItem || !strlen(subItem)) && strlen(defaultSubItem))
-      subItem = defaultSubItem;  /// possible problem here with truncated default
-
-  if (!suffixCode && subItem && strlen(subItem))
-      suffixCode = retrieveCode(&subItem);
-
-  if (!suffixCode && defaultSuffixCode)
-      suffixCode = defaultSuffixCode;
-
-    yield();
-    debugSerial<<F("RAM=")<<freeRam()<<F(" Item=")<<itemArr->name<<F(" Sub=")<<subItem<<F(" Suff=")<<suffixCode<<F(" Cmd=")<<cmd<<F(" Par=(");
-    if (!itemArr) return -1;
-
-    int Par[MAXCTRLPAR] = {0, 0, 0};
-    if (Parameters)
-            for (short i=0;i<n && i<MAXCTRLPAR;i++){
-              Par[i] = Parameters[i];
-              debugSerial<<F("<")<<Par[i]<<F(">");
-            }
-    debugSerial<<F(")")<<endl;
-
-    //======================//
-    itemCmd _itemCmd(ST_VOID,CMD_VOID);
-    switch (n) {
-    case 0:
-              _itemCmd.Cmd(cmd);
-              break;
-
-    case 1:   _itemCmd.Percents((uint32_t)Parameters[0]);
-              break;
-
-    case 2:   _itemCmd.setH(Parameters[0]);
-              _itemCmd.setS(Parameters[1]);
-              _itemCmd.setArgType(ST_HSV);
-              break;
-
-    case 3:   _itemCmd.HSV(Parameters[0],Parameters[1],Parameters[2]);
-              break;
-
-    }
-    //=============//
-
-    if (itemType != CH_GROUP )
-    {
-    //Check if subitem is some sort of command
-    int subitemCmd = subitem2cmd(subItem);
-    if (subitemCmd && subitemCmd != getCmd())
-        {
-          debugSerial<<F("Ignored, channel cmd=")<<getCmd()<<endl;
-          return -1;
-        }
-    }
-
-    //int itemCategory = itemType;
-
-    if (itemType == CH_GROUP && !send)
-      {
-        debugSerial<<F("Skip Grp")<<endl;
-        return -1;
-      }
-
-
-    int iaddr = getArg();
-    int chActive =isActive();
-    itemArgStore st;
-    switch (cmd) {
-        int t;
-
-
-        case CMD_TOGGLE:
-            if (chActive>0) cmd = CMD_OFF;
-            else cmd = CMD_ON;
-            break;
-
-        case CMD_RESTORE:
-            if (itemType != CH_GROUP) //individual threating of channels. Ignore restore command for groups
-                switch (t = getCmd()) {
-                    case CMD_HALT: //previous command was HALT ?
-                        debugSerial << F("Restored from:") << t << endl;
-                        if (itemType == CH_THERMO) cmd = CMD_AUTO;
-                            else cmd = CMD_ON;    //turning on
-                        break;
-                    default:
-                        return -3;
-                }
-            break;
-        case CMD_XOFF:
-            if (itemType != CH_GROUP) //individual threating of channels. Ignore restore command for groups
-                switch (t = getCmd()) {
-                    case CMD_XON: //previous command was CMD_XON ?
-                        debugSerial << F("Turned off from:") << t << endl;
-                        cmd = CMD_OFF;    //turning Off
-                        break;
-                    default:
-                        debugSerial<<F("XOFF skipped. Prev cmd:")<<t<<endl;
-                      return -3;
-
-              }
-              break;
-      case CMD_DN:
-      case CMD_UP:
-      {
-      if (itemType == CH_GROUP) break; ////bug here
-      if (!n || !Par[0]) Par[0] = DEFAULT_INC_STEP;
-      if (cmd == CMD_DN) Par[0]=-Par[0];
-      st.aslong = getVal();
-      int cType=getChanType();
-
-      debugSerial<<"from: h="<<st.h<<" s="<<st.s <<" v="<<st.v<<endl;
-                switch (suffixCode)
-                {
-                  case S_NOTFOUND:
-                  case S_SET:
-                  Par[0] += st.v;
-                  if (Par[0]>100) Par[0]=100;
-                  if (Par[0]<0) Par[0]=0;
-                  n=1;
-                  cmd=CMD_VOID;
-                  debugSerial<<" to v="<<Par[0]<<endl;
-                  break;
-                  case S_HUE:
-                  case S_SAT:
-                    if ( cType != CH_RGB && cType != CH_RGBW && cType != CH_GROUP) return 0; //HUE and SAT only applicable for RGBx channels
-                 }
-
-                if ( cType == CH_RGB || cType == CH_RGBW)
-                  {
-                  bool modified = false;
-                  switch (suffixCode)
-                    {
-                      case S_HSV:
-                      Par[0] += st.h;
-                      Par[1] += st.s;
-                      Par[2] += st.v;
-                      modified = true;
-                      break;
-
-                      case S_HUE:
-                      Par[0] += st.h;
-                      Par[1] = st.s;
-                      Par[2] = st.v;
-
-                      modified = true;
-                      break;
-
-                      case S_SAT:
-                      Par[1] = st.s + Par[0];
-                      Par[0] = st.h;
-                      Par[2] = st.v;
-
-                      modified = true;
-                      break;
-                   } //switch suffix
-
-                 if (modified)
-                 {
-                 if (Par[0]>365 ) Par[0]=0;
-                 if (Par[0]<0) Par[0]=365;
-                 if (Par[1]>100) Par[1]=100;
-                 if (Par[1]<0) Par[1]=0;
-                 if (Par[2]>100) Par[2]=100;
-                 if (Par[2]<0) Par[2]=0;
-
-                 n=3;
-                 cmd=CMD_VOID;
-                 suffixCode=S_SET;
-                 debugSerial<<"to: h="<<Par[0]<<" s="<<Par[1] <<" v="<<Par[2]<<endl;
-               } // if modified
-               } //RGBx channel
-              }
-              break;
-       case CMD_VOID:
-                   //if (itemType == CH_GROUP || n!=1) break;
-                   if (n!=1) break;
-                   int cType=getChanType();
-                   if ( cType == CH_RGB || cType == CH_RGBW || cType == CH_GROUP )
-                   {
-                         st.aslong = getVal();
-                         //st.hsv_flag=1;
-                         setSubtype(ST_HSV);
-                         switch (suffixCode)
-                         {
-                               case S_SAT:
-                               st.s = Par[0];
-
-                               Par[0] = st.h;
-                               Par[1] = st.s;
-                               Par[2] = st.v;
-
-                               n=3;
-                               setVal(st.aslong);
-                               break;
-
-                               case S_HUE:
-                               st.h = Par[0];
-                               Par[1] = st.s;
-                               Par[2] = st.v;
-
-                               n=3;
-                               setVal(st.aslong);
-                             }
-                           //if (itemType == CH_GROUP) break;
-                         }
-                    else // Non-color channel
-                    if (suffixCode == S_SAT || suffixCode == S_HUE) return -3;
-
-    }
-
-    if (driver) //New style modular code
-            {
-              int res = -1;
-              switch (cmd)
-              {
-                case CMD_XON:
-                if (!chActive>0)  //if channel was'nt active before CMD_XON
-                      {
-                        debugSerial<<F("Turning XON\n");
-                        //res = driver->Ctrl(CMD_ON, n, Par, suffixCode, subItem);
-                        res = driver->Ctrl(_itemCmd.Cmd(CMD_ON),  subItem);
-                        setCmd(CMD_XON);
-                      }
-                  else
-                  {  //cmd = CMD_ON;
-                    debugSerial<<F("Already Active\n");
-                    return -3;
-                  }
-                break;
-                case CMD_HALT:
-                if (chActive>0)  //if channel was active before CMD_HALT
-                      {
-                        res = driver->Ctrl(_itemCmd.Cmd(CMD_OFF), subItem);
-                        setCmd(CMD_HALT);
-                        return res;
-                      }
-                else
-                      {
-                        debugSerial<<F("Already Inactive\n");
-                        return -3;
-                      }
-                break;
-                case CMD_OFF:
-                if (getCmd() != CMD_HALT) //Halted, ignore OFF
-                     {
-                       res = driver->Ctrl(_itemCmd, subItem);
-                       setCmd(CMD_OFF);
-                     }
-                else
-                      {
-                        debugSerial<<F("Already Halted\n");
-                        return -3;
-                      }
-                break;
-                ////
-                //case CMD_SET:
-                //res = driver->Ctrl(cmd, n, Parameters, send, suffixCode, subItem);
-                //break;
-                //
-                default:
-                res = driver->Ctrl(_itemCmd,   subItem);
-                if (cmd) setCmd(cmd);
-              }
-              return res;
-            }
-    // Legacy monolite core code
-    bool toExecute = (chActive>0); //if channel is already active - unconditionally propogate changes
-
-    switch (cmd) {
-        case 0:      // No command - set params
-
-    if (!suffixCode) toExecute= true;
-            if (suffixCode == S_HUE || suffixCode == S_SAT) break;
-            switch (itemType) {
-
-                case CH_RGBW: //only if configured VAL array
-                    if (!Par[1] && (n == 3)) itemType = CH_WHITE;
-                case CH_RGB:
-                case CH_GROUP: //Save for groups as well
-                st.aslong = getVal();
-                   switch (n)
-                  {
-                   case 1:
-
-                      st.v = Par[0]; //Volume only
-                      if (getSubtype()==ST_HSV || getSubtype()==ST_RGB)
-                      {
-                      Par[0] = st.h;
-                      Par[1] = st.s;
-                      Par[2] = st.v;
-                      n = 3;}
-                      break;
-                   case 2: // Just hue and saturation
-                      st.h = Par[0];
-                      st.s = Par[1];
-                      Par[2] = st.v;
-                      //st.hsv_flag = 1;
-                      setSubtype(ST_HSV);
-                      n = 3;
-                      break;
-                   case 3: //complete triplet
-                      st.h = Par[0];
-                      st.s = Par[1];
-                      st.v = Par[2];
-                      //st.hsv_flag = 1;
-                      setSubtype(ST_HSV);
-                   }
-                setVal(st.aslong);
-                if (!suffixCode)
-                          { //
-                            if (chActive>0 && !st.v)
-                                      {
-                                      setCmd(CMD_OFF);
-                                      SendStatus(SEND_COMMAND | SEND_PARAMETERS | SEND_DEFFERED);
-                                    }
-                            else if (chActive==0 && st.v)
-                                      {
-                                      setCmd(CMD_ON);
-                                      SendStatus(SEND_COMMAND | SEND_PARAMETERS | SEND_DEFFERED);
-                                      }
-                          ////  else setCmd(0);
-                            SendStatus(SEND_PARAMETERS | SEND_DEFFERED);
-                          }
-                else
-                          {
-                        ////  setCmd(0);
-                          SendStatus(SEND_PARAMETERS | SEND_DEFFERED);
-                          }
-                    break;
-                case CH_PWM:
-                case CH_VC:
-                case CH_DIMMER:
-                case CH_MODBUS:
-                    setVal(Par[0]);          // Store value
-//                    setCmd(cmd2changeActivity(chActive,cmd));
-                    if (!suffixCode)
-                              { // Not restoring, working
-                                if (chActive>0 && !Par[0]) setCmd(CMD_OFF);
-                                if (chActive==0 && Par[0]) setCmd(CMD_ON);
-                                SendStatus(SEND_COMMAND | SEND_PARAMETERS | SEND_DEFFERED); // Send back parameter for channel above this line
-                              }
-                  else    SendStatus(SEND_PARAMETERS | SEND_DEFFERED);
-                    break;
-
-                case CH_VCTEMP: // moved
-                case CH_THERMO:  ///? wasnt send before/ now will ///
-                    setVal(Par[0]);          // Store value
-                    if (send) SendStatus(SEND_PARAMETERS | SEND_DEFFERED); // Send back parameter for channel above this line
-            }//itemtype
-
-            if (! toExecute && itemType !=CH_GROUP) return 1; // Parameters are stored, no further action required
-            break;
-
-        case CMD_XON:
-        if (!chActive>0)  //if channel was'nt active before CMD_XON
-              {
-                debugSerial<<F("Turning XON\n");
-//                setCmd(cmd);
-              }
-          else
-          {  //cmd = CMD_ON;
-            debugSerial<<F("Already Active\n");
-            if (itemType != CH_GROUP) return -3;
-          }
-       case CMD_ON:
-       case CMD_COOL:
-       case CMD_AUTO:
-       case CMD_HEAT:
-       setCmd(cmd);
-       if (chActive>0 && send)
-                          {
-                            SendStatus(SEND_COMMAND);
-                            return 1;
-                          }
-        {
-                short params = 0;
-                //retrive stored values
-                st.aslong = getVal();
-
-                // If command is ON but saved volume to low - setup mimimum volume
-                switch (itemType) {
-                  case CH_DIMMER:
-                  case CH_MODBUS:
-                  if (st.aslong<MIN_VOLUME && send) st.aslong=INIT_VOLUME;
-                  setVal(st.aslong);
-                  break;
-                  case CH_RGB:
-                  case CH_RGBW:
-                  if (st.aslong && (st.v<MIN_VOLUME) && send) st.v=INIT_VOLUME;
-                  setVal(st.aslong);
-                }
-
-                if (st.aslong )  //Stored smthng
-
-                    switch (itemType) {
-                        case CH_GROUP:
-                            if (send && isActive()==0) SendStatus(SEND_COMMAND);          // Just send ON, suppress send back ON of chan already active
-                            break;
-                        case CH_RGBW:
-                        case CH_RGB:
-                            Par[0] = st.h;
-                            Par[1] = st.s;
-                            Par[2] = st.v;
-                            params = 3;
-                            if (send) SendStatus(SEND_COMMAND | SEND_PARAMETERS); // ???Send restored triplet. In any cases
-                            break;
-
-                        case CH_VCTEMP:
-                        case CH_PWM:
-                        case CH_DIMMER:         //Everywhere, in flat VAL
-                        case CH_MODBUS:
-                        case CH_VC:
-                            Par[0] = st.aslong;
-                            params = 1;
-                            if (send) SendStatus(SEND_COMMAND | SEND_PARAMETERS);  // ???Send restored parameter, even if send=false - no problem, loop will be supressed at next hop
-                            break;
-                        case CH_THERMO:
-                            Par[0] = st.aslong;
-                            params = 0;
-                            if (send) SendStatus(SEND_COMMAND);  //  Just ON (switch)
-                            break;
-                        default:
-                            if (send) SendStatus(SEND_COMMAND);          // Just send ON
-                    }//itemtype switch
-                else {// Default settings, values not stored yet
-                    debugSerial<<st.aslong<<F(": No stored values - default\n");
-                    switch (itemType) {
-                        case CH_VCTEMP:
-                        case CH_THERMO:
-                            Par[0] = 20;   //20 degrees celsium - safe temperature
-                            params = 1;
-                            setVal(20);
-                            if (send) SendStatus(SEND_COMMAND | SEND_PARAMETERS); //??? // deffered ???
-                            break;
-                        case CH_RGBW:
-                        case CH_RGB:
-                            Par[0] = 100;
-                            Par[1] = 0;
-                            Par[2] = 100;
-                            params = 3;
-                            // Store
-                            st.h = Par[0];
-                            st.s = Par[1];
-                            st.v = Par[2];
-                            setVal(st.aslong);
-                            if (send) SendStatus(SEND_COMMAND | SEND_PARAMETERS ); // deffered ???
-                            break;
-                        case CH_RELAY:
-                            Par[0] = 100;
-                            params = 1;
-                            setVal(100);
-                            if (send) SendStatus(SEND_COMMAND); // deffered ???
-                            break;
-                      default:
-                            Par[0] = 100;
-                            params = 1;
-                            setVal(100);
-                            if (send) SendStatus(SEND_COMMAND | SEND_PARAMETERS); //??? // deffered ???
-                    }
-                } // default handler
-                for (short i = 0; i < params; i++) {
-                    debugSerial<<F("Restored: ")<<i<<F("=")<<Par[i]<<endl;
-                }
-
-            if ((itemType == CH_RGBW) && (Par[1] == 0)) itemType = CH_WHITE;
-          }
-
-            break; //CMD_ON
-
-        case CMD_OFF:
-            if (getCmd() != CMD_HALT) //if channels are halted - OFF to be ignored (restore issue)
-            {
-                Par[0] = 0;
-                Par[1] = 0;
-                Par[2] = 0;
-                setCmd(cmd);
-                if (send) SendStatus(SEND_COMMAND);
-            }
-            break;
-
-        case CMD_HALT:
-
-            if (chActive>0) {
-                Par[0] = 0;
-                Par[1] = 0;
-                Par[2] = 0;
-                if (getCmd() == CMD_XON) setCmd(CMD_OFF); //Prevent restoring temporary turned on channels (by XON)
-                    else setCmd(cmd);
-                SendStatus(SEND_COMMAND); //HALT to OFF mapping - send in any cases
-                debugSerial<<F(" Halted\n");
-            }
-
-
-    }//switch cmd
-
-
-
-
-    int rgbSaturation =map(Par[1], 0, 100, 0, 255);
-  //  int rgbValue = map(Par[2], 0, 100, 0, 255);
-  //Vebler-Heffler law
-  //  float x = Par[2]/25.-3.;
-  //  int rgbValue = round(exp(x)/(exp(1)/255));
-  int rgbValue = getBright(Par[2]);
-
-    switch (itemType) {
-
-#ifdef _dmxout
-        case CH_DIMMER: //Dimmed light
-            if (iaddr>0)
-            // DmxWrite(iaddr, map(Par[0], 0, 100, 0, 255));
-            DmxWrite(iaddr, getBright(Par[0]));
-            break;
-        case CH_RGBW: //Colour RGBW
-        // Saturation 0  - Only white
-        // 0..50 - white + RGB
-        //50..100 RGB
-        {
-  //          int k;
-            if (Par[1]<50 && iaddr>0) { // Using white
-                            DmxWrite(iaddr + 3, getBright255(map((50 - Par[1]) * Par[2], 0, 5000, 0, 255)));
-                            int rgbvLevel = map (Par[1],0,50,0,255*2);
-                            rgbValue = map(getBright(Par[2]), 0, 255, 0, rgbvLevel);
-                            rgbSaturation = map(Par[1], 0, 50, 255, 100);
-                            if (rgbValue>255) rgbValue = 255;
-                           }
-            else
-            {
-              //rgbValue = map(Par[2], 0, 100, 0, 255);
-              rgbSaturation = map(Par[1], 50, 100, 100, 255);
-              if (iaddr>0) DmxWrite(iaddr + 3, 0);
-            }
-            //DmxWrite(iaddr + 3, k = map((100 - Par[1]) * Par[2], 0, 10000, 0, 255));
-            //debugSerial<<F("W:")<<k<<endl;
-        }
-        case CH_RGB: // RGB
-        if (iaddr>0)
-        {
-          #ifdef ADAFRUIT_LED
-            Adafruit_NeoPixel strip(0, 0, 0);
-            uint32_t rgb = strip.ColorHSV(map(Par[0], 0, 365, 0, 65535), rgbSaturation, rgbValue);
-            DmxWrite(iaddr, (rgb >> 16)& 0xFF);
-            DmxWrite(iaddr + 1, (rgb >> 8) & 0xFF);
-            DmxWrite(iaddr + 2, rgb & 0xFF);
-          #else
-            CRGB rgb = CHSV(map(Par[0], 0, 365, 0, 255), rgbSaturation, rgbValue);
-            DmxWrite(iaddr, rgb.r);
-            DmxWrite(iaddr + 1, rgb.g);
-            DmxWrite(iaddr + 2, rgb.b);
-          #endif
-            break;
-        }
-        case CH_WHITE:
-        if (iaddr>0)
-        {
-            DmxWrite(iaddr, 0);
-            DmxWrite(iaddr + 1, 0);
-            DmxWrite(iaddr + 2, 0);
-        //    DmxWrite(iaddr + 3, map(Par[2], 0, 100, 0, 255));
-        DmxWrite(iaddr + 3,rgbValue);
-            break;
-          }
-#endif
-
-#ifndef MODBUS_DISABLE
-        case CH_MODBUS:
-        modbusDimmerSet(Par[0]);
-        break;
-#endif
-
-
-        case CH_GROUP://Group
-        {
-            if (itemArg->type == aJson_Array) {
-                aJsonObject *i = itemArg->child;
-                configLocked++;
-                while (i) {
-                    if (i->type == aJson_String)
-                      {
-                      Item it(i->valuestring);
-                      it.Ctrl(cmd, n, Par, suffixCode,subItem); //// was true
-                      }
-                    i = i->next;
-                } //while
-                configLocked--;
-            } //if
-        } //case
-            break;
-        case CH_RELAY:
-           if (iaddr)
-           {
-            int k;
-            short inverse = 0;
-
-            if (iaddr < 0) {
-                iaddr = -iaddr;
-                inverse = 1;
-            }
-            pinMode(iaddr, OUTPUT);
-
-            if (inverse)
-                digitalWrite(iaddr, k = ((cmd == CMD_ON || cmd == CMD_XON) ? LOW : HIGH));
-            else
-                digitalWrite(iaddr, k = ((cmd == CMD_ON || cmd == CMD_XON) ? HIGH : LOW));
-            debugSerial<<F("Pin:")<<iaddr<<F("=")<<k<<endl;
-            break;
-          }
-        case CH_THERMO:
-                ///thermoSet(name,cmd,Par1); all activities done - update temp & cmd
-                break;
-
-        case CH_PWM:
-           if (iaddr)
-           {
-            int k;
-            short inverse = 0;
-
-            if (iaddr < 0) {
-                iaddr = -iaddr;
-                inverse = 1;
-            }
-            pinMode(iaddr, OUTPUT);
-            //timer 0 for pin 13 and 4
-            //timer 1 for pin 12 and 11
-            //timer 2 for pin 10 and 9
-            //timer 3 for pin 5 and 3 and 2
-            //timer 4 for pin 8 and 7 and 6
-            //prescaler = 1 ---> PWM frequency is 31000 Hz
-            //prescaler = 2 ---> PWM frequency is 4000 Hz
-            //prescaler = 3 ---> PWM frequency is 490 Hz (default value)
-            //prescaler = 4 ---> PWM frequency is 120 Hz
-            //prescaler = 5 ---> PWM frequency is 30 Hz
-            //prescaler = 6 ---> PWM frequency is <20 Hz
-#if defined(__AVR_ATmega2560__)
-            int tval = 7;             // this is 111 in binary and is used as an eraser
-            TCCR4B &= ~tval;   // this operation (AND plus NOT),  set the three bits in TCCR2B to 0
-            TCCR3B &= ~tval;
-            tval = 2;
-            TCCR4B |= tval;
-            TCCR3B |= tval;
-#endif
-            if (inverse) k = map(Par[0], 100, 0, 0, 255);
-            else k = map(Par[0], 0, 100, 0, 255);
-            analogWrite(iaddr, k);
-            debugSerial<<F("Pin:")<<iaddr<<F("=")<<k<<endl;
-            break;
-        }
-#ifndef MODBUS_DISABLE
-        case CH_VC:
-            VacomSetFan(Par[0], cmd);
-            break;
-        case CH_VCTEMP: {
-//            Item it(itemArg->valuestring);
-//            if (it.isValid() && it.itemType == CH_VC)
-            VacomSetHeat(Par[0], cmd);
-            break;
-        }
-#endif
-    }
-return 1;
-}
-
-
-*/
 
 
 
@@ -2053,7 +1455,7 @@ switch (cause)
 
 void Item::sendDelayedStatus()
 { long int flags = getFlag(SEND_COMMAND | SEND_PARAMETERS);
-//  debugSerial<<flags<<F(" Delayed Status ")<<itemArr->name<<endl;
+
       if (flags && lanStatus==OPERATION)
       {
       SendStatus(flags);//(SEND_COMMAND | SEND_PARAMETERS);
@@ -2072,6 +1474,7 @@ int Item::SendStatus(int sendFlags) {
     else {
       int chancmd=getCmd();
       sendFlags |= getFlag(SEND_COMMAND | SEND_PARAMETERS); //if some delayed status is pending
+
       char addrstr[48];
       char valstr[16] = "";
       char cmdstr[8] = "";
@@ -2079,6 +1482,7 @@ int Item::SendStatus(int sendFlags) {
       if (sendFlags & SEND_PARAMETERS)
       {
       // Preparing parameters payload //////////
+/*
        itemArgStore st;
        int chanType = itemType;
         if (driver) chanType = driver->getChanType();
@@ -2103,7 +1507,15 @@ int Item::SendStatus(int sendFlags) {
                default:
                snprintf(valstr, sizeof(valstr), "%ld", st.aslong);
            }//itemtype
-        }
+           */
+
+
+
+
+    itemCmd st(ST_VOID,CMD_VOID);
+    st.loadItem(this, true);
+    st.toString(valstr, sizeof(valstr), SEND_PARAMETERS);
+    }
     if (sendFlags & SEND_COMMAND)
     {
     // Preparing Command payload  //////////////
diff --git a/lighthub/itemCmd.cpp b/lighthub/itemCmd.cpp
index b26ae93..df3dc21 100644
--- a/lighthub/itemCmd.cpp
+++ b/lighthub/itemCmd.cpp
@@ -39,17 +39,48 @@ int txt2cmd(char *payload) {
 
 itemCmd::itemCmd(uint8_t _type, uint8_t _code)
 {
+  cmd.aslong=0;
+  param.aslong=0;
+
   cmd.itemArgType=_type;
   cmd.cmdCode=_code;
 }
 
 itemCmd::itemCmd(float val)
 {
-  cmd.cmdCode=0;
+  cmd.aslong=0;
+  param.aslong=0;
+
   cmd.itemArgType=ST_FLOAT;
   param.asfloat=val;
 }
 
+itemCmd itemCmd::setChanType(short chanType)
+{
+  switch (chanType)
+  {
+    case CH_RGB:
+    case CH_RGBW:
+    case CH_SPILED:
+    cmd.itemArgType=ST_HSV;
+    break;
+    case CH_AC:
+    case CH_THERMO:
+    case CH_VCTEMP:
+    cmd.itemArgType=ST_FLOAT_CELSIUS;
+    break;
+    case CH_DIMMER:
+    case CH_MOTOR:
+    case CH_PWM:
+    case CH_RELAY:
+    cmd.itemArgType=ST_PERCENTS;
+    break;
+    default:
+    cmd.itemArgType=ST_PERCENTS;
+  }
+  return *this;
+}
+
 itemCmd itemCmd::setDefault()
 {
   switch (cmd.itemArgType){
@@ -71,7 +102,7 @@ itemCmd itemCmd::setDefault()
   return *this;
 }
 
-itemCmd itemCmd::setH(uint16_t h)
+bool itemCmd::setH(uint16_t h)
 {
   int par=h;
   switch (cmd.itemArgType)
@@ -79,16 +110,20 @@ itemCmd itemCmd::setH(uint16_t h)
     case ST_VOID:
       cmd.itemArgType=ST_HSV;
     case ST_HSV:
-      if (par>100) par=100;
     case ST_HSV255:
-      if (par>255) par=255;
+      if (par>365) par=365;
       if (par<0) par=0;
       param.h=par;
+      break;
+
+    default:
+  //  debugSerial<<F("Can't assign HUE to type ")<<cmd.itemArgType<<endl;
+    return false;
   }
-  return *this;
+  return true;
 }
 
-itemCmd itemCmd::setS(uint8_t s)
+bool itemCmd::setS(uint8_t s)
 {
   int par=s;
   switch (cmd.itemArgType)
@@ -97,15 +132,31 @@ itemCmd itemCmd::setS(uint8_t s)
       cmd.itemArgType=ST_HSV;
     case ST_HSV:
       if (par>100) par=100;
+      param.s=par;
+      break;
     case ST_HSV255:
       if (par>255) par=255;
       if (par<0) par=0;
       param.s=par;
+      break;
+    default:
+//    debugSerial<<F("Can't assign saturation to type ")<<cmd.itemArgType<<endl;
+    return false;
   }
-  return *this;
+  return true;
 }
 
-itemCmd itemCmd::incrementPercents(int16_t dif)
+uint16_t itemCmd::getH()
+{
+  return param.h;
+}
+
+uint16_t itemCmd::getS()
+{
+  return param.s;
+}
+
+bool itemCmd::incrementPercents(int16_t dif)
 { int par=param.v;
   switch (cmd.itemArgType)
   {
@@ -121,12 +172,13 @@ itemCmd itemCmd::incrementPercents(int16_t dif)
      if (par>255) par=255;
      if (par<0) par=0;
     break;
+   default: return false;
   }
   param.v=par;
-  return *this;
+  return true;
 }
 
-itemCmd itemCmd::incrementH(int16_t dif)
+bool itemCmd::incrementH(int16_t dif)
 { int par=param.h;
   switch (cmd.itemArgType)
   {
@@ -135,31 +187,34 @@ itemCmd itemCmd::incrementH(int16_t dif)
    par+=dif;
    if (par>365) par=0;
    if (par<0) par=365;
+   break;
+  default: return false;
   break;
 }
 param.h=par;
-return *this;
+return true;
 }
 
-itemCmd itemCmd::incrementS(int16_t dif)
+bool itemCmd::incrementS(int16_t dif)
 {int par=param.s;
   switch (cmd.itemArgType)
   {
-    case ST_PERCENTS:
+    //case ST_PERCENTS:
     case ST_HSV:
      par+=dif;
      if (par>100) par=100;
      if (par<0) par=0;
     break;
-    case ST_PERCENTS255:
+    //case ST_PERCENTS255:
     case ST_HSV255:
      par+=dif;
      if (par>255) par=255;
      if (par<0) par=0;
     break;
+   default: return false;
   }
   param.s=par;
-  return *this;
+  return true;
 
 }
 
@@ -168,6 +223,7 @@ itemCmd itemCmd::assignFrom(itemCmd from)
 {
   bool RGBW_flag   = false;
   bool HSV255_flag = false;
+  cmd.suffixCode=from.cmd.suffixCode;
 
   switch (cmd.itemArgType){ //Destination
      case ST_HSV:
@@ -201,6 +257,7 @@ itemCmd itemCmd::assignFrom(itemCmd from)
               default:
                   debugSerial<<F("Wrong Assignment ")<<from.cmd.itemArgType<<F("->")<<cmd.itemArgType<<endl;
               }
+              break;
         case ST_HSV255:
         case ST_PERCENTS255:
            switch (from.cmd.itemArgType)
@@ -232,7 +289,7 @@ itemCmd itemCmd::assignFrom(itemCmd from)
               default:
                        debugSerial<<F("Wrong Assignment ")<<from.cmd.itemArgType<<F("->")<<cmd.itemArgType<<endl;
               }
-
+             break;
         case ST_VOID:
              cmd.itemArgType=from.cmd.itemArgType;
 
@@ -298,6 +355,7 @@ itemCmd itemCmd::assignFrom(itemCmd from)
                     param.g=rgb.g;
                     param.b=rgb.b;
                   #endif
+                  break;
                 }
             default:
                     debugSerial<<F("Wrong Assignment ")<<from.cmd.itemArgType<<F("->")<<cmd.itemArgType<<endl;
@@ -388,7 +446,7 @@ uint8_t itemCmd::getArgType()
 
 itemCmd itemCmd::setArgType(uint8_t type)
 {
-   cmd.itemArgType=type;
+   cmd.itemArgType=type & 0xF;
   return *this;
 }
 
@@ -515,10 +573,16 @@ bool itemCmd::loadItem(Item * item, bool includeCommand)
 {
   if (item && item->isValid())
   {
-  param.asInt32=item->getVal();
-  cmd.itemArgType=item->getSubtype();
-  if (includeCommand) cmd.cmdCode=item->getCmd();
-  return (cmd.itemArgType!=ST_VOID);
+  short subtype =item->getSubtype();
+  if (subtype)
+        {
+          param.asInt32=item->getVal();
+          cmd.itemArgType= subtype;
+          if (includeCommand) cmd.cmdCode=item->getCmd();
+          debugSerial<<F("Loaded :");
+          debugOut();
+          return 1;
+        }
   }
 return false;
 }
@@ -530,6 +594,8 @@ bool itemCmd::saveItem(Item * item, bool includeCommand)
   item->setVal(param.asInt32);
   item->setSubtype(cmd.itemArgType);
   if (includeCommand) item->setCmd(cmd.cmdCode);
+  debugSerial<<F("Saved :");
+  debugOut();
   return true;
   }
 return false;
@@ -537,13 +603,13 @@ return false;
 
 
 
-char * itemCmd::toString(char * Buffer, int bufLen)
+char * itemCmd::toString(char * Buffer, int bufLen, int sendFlags )
      {
 
        if (!Buffer || !bufLen) return NULL;
        *Buffer=0;
        char * argPtr=Buffer;
-       if (isCommand())
+       if (isCommand() && (sendFlags & SEND_COMMAND))
                         {
                           int len;
                           strncpy_P(Buffer, commands_P[cmd.cmdCode], bufLen);
@@ -552,12 +618,14 @@ char * itemCmd::toString(char * Buffer, int bufLen)
                           argPtr+=len;
                           bufLen-=len;
                         }
-
+       if (sendFlags & SEND_PARAMETERS)
        switch (cmd.itemArgType)
        {
 
          case ST_PERCENTS:
          case ST_PERCENTS255:
+            snprintf(argPtr, bufLen, "%u", param.v);
+        break;
          case ST_UINT32:
             snprintf(argPtr, bufLen, "%lu", param.asUint32);
          break;
@@ -592,3 +660,10 @@ char * itemCmd::toString(char * Buffer, int bufLen)
        }
       return Buffer;
      }
+
+     void itemCmd::debugOut()
+     {
+       char buf[32];
+       toString(buf,sizeof(buf));
+       debugSerial<<buf<<F(" AT:")<<getArgType()<<F(" Suff:")<<getSuffix()<<endl;
+     }
diff --git a/lighthub/itemCmd.h b/lighthub/itemCmd.h
index 7b16b8c..c72dfe1 100644
--- a/lighthub/itemCmd.h
+++ b/lighthub/itemCmd.h
@@ -19,6 +19,7 @@ e-mail    anklimov@gmail.com
 */
 #pragma once
 #include "Arduino.h"
+///#include "item.h"
 
 typedef  char cmdstr[9];
 
@@ -98,16 +99,17 @@ ST_FLOAT        = 13//,
 #define ST_PERCENTS     1
 #define ST_TENS         2
 #define ST_HSV          3
-#define ST_FLOAT_CELSIUS   4
-#define ST_FLOAT_FARENHEIT 5
-#define ST_RGB          6
-#define ST_RGBW         7
-#define ST_PERCENTS255  8
-#define ST_HSV255       9
-#define ST_INT32        10
-#define ST_UINT32       11
-#define ST_STRING       12
-#define ST_FLOAT        13
+#define ST_HSVW         4
+#define ST_FLOAT_CELSIUS   5
+#define ST_FLOAT_FARENHEIT 6
+#define ST_RGB          7
+#define ST_RGBW         8
+#define ST_PERCENTS255  9
+#define ST_HSV255       10
+#define ST_INT32        11
+#define ST_UINT32       12
+#define ST_STRING       13
+#define ST_FLOAT        14
 
 
 #pragma pack(push, 1)
@@ -122,12 +124,18 @@ typedef union
         uint8_t cmdCode;
             union {
                   uint8_t cmdFlag;
+/*
                   struct
                       { uint8_t  suffixCode:4;
                         uint8_t  itemArgType:4;
                       };
+                      */
                   };
-        uint8_t cmdEffect;
+                  struct
+                      { uint8_t  suffixCode:4;
+                        uint8_t  itemArgType:4;
+                      };
+    //    uint8_t cmdEffect;
         uint8_t cmdParam;
       };
 } itemCmdStore;
@@ -181,8 +189,10 @@ public:
   itemCmd HSV(uint16_t h, uint8_t s, uint8_t v);
   itemCmd RGB(uint8_t r, uint8_t g, uint8_t b);
   itemCmd RGBW(uint8_t r, uint8_t g, uint8_t b, uint8_t w);
-  itemCmd setH(uint16_t);
-  itemCmd setS(uint8_t);
+  bool setH(uint16_t);
+  bool setS(uint8_t);
+  uint16_t getH();
+  uint16_t getS();
   itemCmd setArgType(uint8_t);
   itemCmd Percents(int i);
   itemCmd Percents255(int i);
@@ -190,9 +200,9 @@ public:
   uint8_t getSuffix();
   itemCmd setSuffix(uint8_t suffix);
 
-  itemCmd incrementPercents(int16_t);
-  itemCmd incrementH(int16_t);
-  itemCmd incrementS(int16_t);
+  bool incrementPercents(int16_t);
+  bool incrementH(int16_t);
+  bool incrementS(int16_t);
 
   long int getInt();
   short    getPercents(bool inverse=false);
@@ -200,13 +210,15 @@ public:
   uint8_t    getCmd();
   uint8_t    getArgType();
   uint8_t    getCmdParam();
-  char   * toString(char * Buffer, int bufLen);
+  char   * toString(char * Buffer, int bufLen, int sendFlags = SEND_COMMAND | SEND_PARAMETERS );
 
   bool isCommand();
   bool isValue();
   bool isHSV();
 
   itemCmd setDefault();
+  itemCmd setChanType(short chanType);
+  void debugOut();
   };
 
 #pragma pack(pop)
diff --git a/lighthub/modules/out_ac.cpp b/lighthub/modules/out_ac.cpp
index 0238d61..1a35b5b 100644
--- a/lighthub/modules/out_ac.cpp
+++ b/lighthub/modules/out_ac.cpp
@@ -263,7 +263,7 @@ return INTERVAL_POLLING;
 };
 
 //int out_AC::Ctrl(short cmd, short n, int * Parameters,  int suffixCode, char* subItem)
-int out_AC::Ctrl(itemCmd cmd,  char* subItem)
+int out_AC::Ctrl(itemCmd cmd,  char* subItem , bool toExecute)
 {char s_mode[10];
   int suffixCode = cmd.getSuffix();
  // Some additional Subitems
diff --git a/lighthub/modules/out_ac.h b/lighthub/modules/out_ac.h
index 3f74ce0..5b0f42a 100644
--- a/lighthub/modules/out_ac.h
+++ b/lighthub/modules/out_ac.h
@@ -30,7 +30,7 @@ public:
     int Status() override;
     int isActive() override;
     //int Ctrl(short cmd, short n=0, int * Parameters=NULL,  int suffixCode=0, char* subItem=NULL) override;
-    int Ctrl(itemCmd cmd,  char* subItem=NULL) override;
+    int Ctrl(itemCmd cmd,  char* subItem=NULL, bool toExecute=true) override;
 
 protected:
     void InsertData(byte data[], size_t size);
diff --git a/lighthub/modules/out_modbus.cpp b/lighthub/modules/out_modbus.cpp
index 30ff83f..beb69b3 100644
--- a/lighthub/modules/out_modbus.cpp
+++ b/lighthub/modules/out_modbus.cpp
@@ -338,11 +338,11 @@ int out_Modbus::getChanType()
 
 
 
-int out_Modbus::Ctrl(itemCmd cmd,   char* subItem)
+int out_Modbus::Ctrl(itemCmd cmd,   char* subItem, bool toExecute)
 {
-int chActive = item->isActive();
-bool toExecute = (chActive>0);
-itemCmd st(ST_UINT32,CMD_VOID);
+//int chActive = item->isActive();
+//bool toExecute = (chActive>0);
+//itemCmd st(ST_UINT32,CMD_VOID);
 int suffixCode = cmd.getSuffix();
 
 if (cmd.isCommand() && !suffixCode) suffixCode=S_CMD; //if some known command find, but w/o correct suffix - got it
@@ -355,58 +355,30 @@ toExecute = true;
 debugSerial<<F("Forced execution");
 case S_SET:
           if (!cmd.isValue()) return 0;
-          //////item->setVal(st=Parameters[0]); //Store
-          if (!suffixCode)
-          {
-            if (chActive>0 && !st.getInt()) item->setCmd(CMD_OFF);
-            if (chActive==0 && st.getInt()) item->setCmd(CMD_ON);
-            item->SendStatus(SEND_COMMAND | SEND_PARAMETERS | SEND_DEFFERED);
-//            if (item->getExt()) item->setExt(millis()+maxOnTime); //Extend motor time
-          }
-          else    item->SendStatus(SEND_PARAMETERS | SEND_DEFFERED);
 
+//TODO
           return 1;
           //break;
 
 case S_CMD:
-      //item->setCmd(cmd.getCmd());
-      st.loadItem(item);
       switch (cmd.getCmd())
           {
           case CMD_ON:
-           //retrive stored values
-           st.loadItem(item);
 
-
-            if (st.getPercents() && (st.getPercents()<MIN_VOLUME) /* && send */) st.Percents(INIT_VOLUME);
-            st.saveItem(item);
-
-            if (st.getPercents())  //Stored smthng
-            {
-              item->SendStatus(SEND_COMMAND | SEND_PARAMETERS);
-              debugSerial<<F("Restored: ")<<st.getPercents()<<endl;
-            }
-            else
-            {
-              debugSerial<<F(": No stored values - default\n");
-              // Store
-              st.setDefault();
-              st.saveItem(item);
-              item->SendStatus(SEND_COMMAND | SEND_PARAMETERS );
-            }
-  //          if (item->getExt()) item->setExt(millis()+maxOnTime); //Extend motor time
             return 1;
 
             case CMD_OFF:
-              item->SendStatus(SEND_COMMAND);
-  //            if (item->getExt()) item->setExt(millis()+maxOnTime); //Extend motor time
+
             return 1;
 
-} //switch cmd
+            default:
+            debugSerial<<F("Unknown cmd ")<<cmd.getCmd()<<endl;
+          } //switch cmd
 
-break;
+    default:
+  debugSerial<<F("Unknown suffix ")<<suffixCode<<endl;
 } //switch suffix
-debugSerial<<F("Unknown cmd")<<endl;
+
 return 0;
 }
 
diff --git a/lighthub/modules/out_modbus.h b/lighthub/modules/out_modbus.h
index 413844b..c7dddc3 100644
--- a/lighthub/modules/out_modbus.h
+++ b/lighthub/modules/out_modbus.h
@@ -31,7 +31,7 @@ public:
     int Status() override;
     int isActive() override;
     int getChanType() override;
-    int Ctrl(itemCmd cmd, char* subItem=NULL) override;
+    int Ctrl(itemCmd cmd, char* subItem=NULL, bool toExecute=true) override;
     //int Ctrl(short cmd, short n=0, int * Parameters=NULL, int suffixCode=0, char* subItem=NULL) override;
 
 protected:
diff --git a/lighthub/modules/out_motor.cpp b/lighthub/modules/out_motor.cpp
index 79b1ea8..dc16fed 100644
--- a/lighthub/modules/out_motor.cpp
+++ b/lighthub/modules/out_motor.cpp
@@ -211,12 +211,12 @@ int out_Motor::getChanType()
 
 
 
-int out_Motor::Ctrl(itemCmd cmd,   char* subItem)
+int out_Motor::Ctrl(itemCmd cmd,   char* subItem , bool toExecute)
 {
-int chActive = item->isActive();
-bool toExecute = (chActive>0);
+//int chActive = item->isActive();
+//bool toExecute = (chActive>0);
 int suffixCode = cmd.getSuffix();
-itemCmd st(ST_PERCENTS,CMD_VOID);
+//itemCmd st(ST_PERCENTS,CMD_VOID);
 if (cmd.isCommand() && !suffixCode) suffixCode=S_CMD; //if some known command find, but w/o correct suffix - got it
 
 item->setFlag(ACTION_NEEDED);
@@ -229,6 +229,8 @@ toExecute = true;
 debugSerial<<F("Forced execution");
 case S_SET:
           if (!cmd.isValue()) return 0;
+          if (item->getExt()) item->setExt(millis()+maxOnTime); //Extend motor time
+          /*
           st.assignFrom(cmd);
           //Store
           st.saveItem(item);
@@ -240,7 +242,7 @@ case S_SET:
             if (item->getExt()) item->setExt(millis()+maxOnTime); //Extend motor time
           }
           else    item->SendStatus(SEND_PARAMETERS | SEND_DEFFERED);
-
+          */
           return 1;
           //break;
 
@@ -249,10 +251,12 @@ case S_CMD:
       switch (cmd.getCmd())
           {
           case CMD_ON:
+
+           /*
            //retrive stored values
             if (st.loadItem(item))
             {
-                if (st.getPercents() && (st.getPercents()<MIN_VOLUME) /* && send */)
+                if (st.getPercents() && (st.getPercents()<MIN_VOLUME))
                  { //Volume too low
                         st.Percents(INIT_VOLUME);
                         st.saveItem(item);
@@ -270,12 +274,12 @@ case S_CMD:
               //item->setVal(st);
               item->SendStatus(SEND_COMMAND | SEND_PARAMETERS );
             }
-
+            */
             if (item->getExt()) item->setExt(millis()+maxOnTime); //Extend motor time
             return 1;
 
             case CMD_OFF:
-              item->SendStatus(SEND_COMMAND);
+              ////item->SendStatus(SEND_COMMAND);
               if (item->getExt()) item->setExt(millis()+maxOnTime); //Extend motor time
             return 1;
 
diff --git a/lighthub/modules/out_motor.h b/lighthub/modules/out_motor.h
index e9ab984..398b375 100644
--- a/lighthub/modules/out_motor.h
+++ b/lighthub/modules/out_motor.h
@@ -26,7 +26,7 @@ public:
     int isActive() override;
     int getChanType() override;
     //int Ctrl(short cmd, short n=0, int * Parameters=NULL,  int suffixCode=0, char* subItem=NULL) override;
-    int Ctrl(itemCmd cmd, char* subItem=NULL) override;
+    int Ctrl(itemCmd cmd, char* subItem=NULL, bool toExecute=true) override;
 
     int8_t pinUp;
     int8_t pinDown;
diff --git a/platformio.ini b/platformio.ini
index 7246a53..ebfb9b6 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,13 +23,13 @@ default_envs =
 ;    mega2560-5500
 
 ; LightHub controller HW revision 2.1 and above (Wiznet 5500 CS on pin 53)
-;    lighthub21
+    lighthub21
 
 ; Arduino DUE  + Ethernet shield Wiznet 5100
 ;    due-5100
 
 ; Generic DUE
-     due
+;     due
 ; Arduino DUE + Ethernet shield Wiznet 5500
 ;   due-5500
 
@@ -581,8 +581,8 @@ framework = arduino
 board = due
 build_flags = !python get_build_flags.py lighthub21
 ;upload_command = arduinoOTA -address 192.168.11.172 -port 65280 -username arduino -password password -b -upload /sketch -sketch $SOURCE
-;upload_command = arduinoOTA -address 192.168.88.34 -port 65280 -username arduino -password password -b -upload /sketch -sketch $SOURCE
-;upload_protocol = custom
+upload_command = arduinoOTA -address 192.168.88.28 -port 65280 -username arduino -password password -b -upload /sketch -sketch $SOURCE
+upload_protocol = custom
 lib_ignore =
        ;DS2482_OneWire   //UNCOMMENT for software 1-wire driver
         DHT sensor library for ESPx