diff --git a/CMakeFiles/rgbcontroller.dir/WirelessRelay.cpp.o b/CMakeFiles/rgbcontroller.dir/WirelessRelay.cpp.o
index fb09d0e..4541c61 100644
Binary files a/CMakeFiles/rgbcontroller.dir/WirelessRelay.cpp.o and b/CMakeFiles/rgbcontroller.dir/WirelessRelay.cpp.o differ
diff --git a/CMakeFiles/rgbcontroller.dir/main.cpp.o b/CMakeFiles/rgbcontroller.dir/main.cpp.o
index 3e2764f..78da093 100644
Binary files a/CMakeFiles/rgbcontroller.dir/main.cpp.o and b/CMakeFiles/rgbcontroller.dir/main.cpp.o differ
diff --git a/WirelessRelay.cpp b/WirelessRelay.cpp
index 5e4872a..1e79cfb 100644
--- a/WirelessRelay.cpp
+++ b/WirelessRelay.cpp
@@ -59,6 +59,7 @@ void WirelessRelay::on()
         sendBit(false);
         sync();
     }
+     _state = true;
 }
 
 void WirelessRelay::off()
@@ -70,6 +71,7 @@ void WirelessRelay::off()
         sendBit(true);
         sync();
     }
+    _state = false;
 }
 
 uint16_t WirelessRelay::getId()
@@ -77,6 +79,11 @@ uint16_t WirelessRelay::getId()
     return _id;
 }
 
+bool WirelessRelay::getExpectedState()
+{
+    return _state;
+}
+
 
 void WirelessRelay::init( volatile unsigned char *port, const unsigned char pin, const uint16_t id)
 {
diff --git a/WirelessRelay.h b/WirelessRelay.h
index e166798..60fe869 100644
--- a/WirelessRelay.h
+++ b/WirelessRelay.h
@@ -10,6 +10,7 @@
 class WirelessRelay
 {
 private:
+     bool _state = false;
      uint16_t _id;
      volatile unsigned char *_port;
      unsigned char _pin;
@@ -24,5 +25,6 @@ public:
     void on(); 
     void off();
     uint16_t getId();
+    bool getExpectedState();
 };
 #endif
diff --git a/main.cpp b/main.cpp
index f05ad1a..4f18d18 100644
--- a/main.cpp
+++ b/main.cpp
@@ -99,7 +99,7 @@ void relayDispatch(WirelessRelayStore* relays, char* inBuffer, Serial* serial)
         serial->write("ST");
         serial->write(relays->count);
         serial->putChar(',');
-        for(uint8_t i = 0; i < relays->count; i++) relays->states[i] ? serial->putChar('1') : serial->putChar('0');
+        for(uint8_t i = 0; i < relays->count; i++) relays->array[i].getExpectedState() ? serial->putChar('1') : serial->putChar('0');
         serial->putChar('\n');
     }
     else 
diff --git a/rgbcontroller b/rgbcontroller
index 685c724..5f1fdb9 100755
Binary files a/rgbcontroller and b/rgbcontroller differ