diff --git a/Curt_MidRoom/src/main.cpp b/Curt_MidRoom/src/main.cpp
index c4ada57..56556ca 100644
--- a/Curt_MidRoom/src/main.cpp
+++ b/Curt_MidRoom/src/main.cpp
@@ -48,6 +48,9 @@ void onMqttConnect(bool sessionPresent);
 void onMqttDisconnect(AsyncMqttClientDisconnectReason reason);
 void onMqttSubscribe(uint16_t packetId, uint8_t qos);
 void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total);
+void readByte(uint8_t data);
+void writeByte(uint8_t data);
+void writeHex(std::string data);
 
 void setup(){
   Serial.begin(9600);
@@ -171,8 +174,11 @@ void onMqttSubscribe(uint16_t packetId, uint8_t qos) {
 }
 
 void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total) {
-  if(strcmp("/home/midroom/curtpos_set", topic) == 0){
-    
+  if(strcmp("/home/midroom/curtcmd", topic) == 0){
+
+  }
+  else if(strcmp("/home/midroom/curtpos_set", topic) == 0){
+
   }
 }
 
diff --git a/ESP_Electro/src/main.cpp b/ESP_Electro/src/main.cpp
index 1b02e72..fdf54b2 100644
--- a/ESP_Electro/src/main.cpp
+++ b/ESP_Electro/src/main.cpp
@@ -65,33 +65,11 @@ void onMqttDisconnect(AsyncMqttClientDisconnectReason reason) {
   digitalWrite(LED_MQ, LOW);
 }
 
-void onMqttSubscribe(uint16_t packetId, uint8_t qos) {
-  Serial.println("Subscribe acknowledged.");
-  Serial.print("  packetId: ");
-  Serial.println(packetId);
-  Serial.print("  qos: ");
-  Serial.println(qos);
-}
-
-void onMqttUnsubscribe(uint16_t packetId) {
-  Serial.println("Unsubscribe acknowledged.");
-  Serial.print("  packetId: ");
-  Serial.println(packetId);
-}
-
-void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total) {
-}
-
-void onMqttPublish(uint16_t packetId) {
-  Serial.println("Publish acknowledged.");
-  Serial.print("  packetId: ");
-  Serial.println(packetId);
-}
 
 void setup(){
   Serial.begin(9600);
   WiFi.mode(WIFI_STA);
-  WiFi.hostname("Test");
+  WiFi.hostname("Electro");
   Serial.begin(9600);
 
   emon1.current(0, 30.0);
@@ -124,11 +102,8 @@ void setup(){
 
 	mqttClient.onConnect(onMqttConnect);
 	mqttClient.onDisconnect(onMqttDisconnect);
-	mqttClient.onSubscribe(onMqttSubscribe);
-	mqttClient.onUnsubscribe(onMqttUnsubscribe);
-	mqttClient.onMessage(onMqttMessage);
-	mqttClient.onPublish(onMqttPublish);
 	mqttClient.setServer(mqtt_server, 1883);
+  mqttClient.setClientId("Electro");
 
   pinMode(LED_WF, OUTPUT);
   pinMode(LED_MQ, OUTPUT);
@@ -141,10 +116,6 @@ void setup(){
   nSec = 0;
   curr = -1;
   nSampl = 0;
-  #ifdef ESP8266
-  Serial.println("ESP8266");
-  delay(1000);
-  #endif
 }
 
 void loop(){
@@ -181,7 +152,6 @@ void loop(){
     }
     if(++nSec > 59){
       nSec = 0;
-      curr = curr / (double)nSampl;
       // Serial.print("Millis: ");
       // yield();
       // Serial.print(millis());
@@ -195,6 +165,7 @@ void loop(){
       // Serial.println(curr * 233);
       if(nSampl > 0){
         //Serial.println("Publish");
+        curr = curr / (double)nSampl;
         char v[7];
         sprintf(v, "%.2f", curr);
         mqttClient.publish("/home/kor/curr", 1, false, v);