diff --git a/node-red-contrib-xiaomi-all/xiaomi-all.js b/node-red-contrib-xiaomi-all/xiaomi-all.js
index 39f87c9..39174f8 100644
--- a/node-red-contrib-xiaomi-all/xiaomi-all.js
+++ b/node-red-contrib-xiaomi-all/xiaomi-all.js
@@ -18,5 +18,4 @@ module.exports = function(RED) {
     }
 
     RED.nodes.registerType("xiaomi-all", XiaomiAllNode);
-
 }
diff --git a/node-red-contrib-xiaomi-gateway/xiaomi-gateway.js b/node-red-contrib-xiaomi-gateway/xiaomi-gateway.js
index 259f365..ffff975 100644
--- a/node-red-contrib-xiaomi-gateway/xiaomi-gateway.js
+++ b/node-red-contrib-xiaomi-gateway/xiaomi-gateway.js
@@ -1,6 +1,7 @@
 module.exports = function(RED) {
     "use strict";
     var dgram = require('dgram');
+    var miDevicesUtils = require('../utils');
     var udpInputPortsInUse = {};
 
     function XiaomiGatewayNode(config) {
@@ -60,6 +61,9 @@ module.exports = function(RED) {
                 var jsonMsg = JSON.parse(msg);
                 if(jsonMsg.data) {
                     jsonMsg.data = JSON.parse(jsonMsg.data) || jsonMsg.data;
+                    if(jsonMsg.data.voltage) {
+                        jsonMsg.data.batteryLevel = miDevicesUtils.computeBatteryLevel(jsonMsg.data.voltage);
+                    }
                 }
                 msg = { payload: jsonMsg };
                 if(jsonMsg.token && node.gateway && jsonMsg.data.ip && jsonMsg.data.ip === node.gateway.ip) {
diff --git a/node-red-contrib-xiaomi-ht/xiaomi-ht.js b/node-red-contrib-xiaomi-ht/xiaomi-ht.js
index 8a3787e..392a12f 100644
--- a/node-red-contrib-xiaomi-ht/xiaomi-ht.js
+++ b/node-red-contrib-xiaomi-ht/xiaomi-ht.js
@@ -28,7 +28,6 @@ module.exports = function(RED) {
                     miDevicesUtils.setStatus(node, data);
 
                     if (node.output == "0") {
-                        miDevicesUtils.prepareFullDataOutput(payload);
                         node.send([msg]);
                     } else if (node.output == "1") {
                         var temp = null;
diff --git a/node-red-contrib-xiaomi-magnet/xiaomi-magnet.js b/node-red-contrib-xiaomi-magnet/xiaomi-magnet.js
index 1ae40d8..2879838 100644
--- a/node-red-contrib-xiaomi-magnet/xiaomi-magnet.js
+++ b/node-red-contrib-xiaomi-magnet/xiaomi-magnet.js
@@ -36,7 +36,6 @@ module.exports = function(RED) {
 
 
                     if (node.output == "0") {
-                        miDevicesUtils.prepareFullDataOutput(payload);
                         node.send([msg]);
                     } else if (node.output == "1") {
                         var status = null;
diff --git a/node-red-contrib-xiaomi-motion/xiaomi-motion.js b/node-red-contrib-xiaomi-motion/xiaomi-motion.js
index 76c5a29..5153f6d 100644
--- a/node-red-contrib-xiaomi-motion/xiaomi-motion.js
+++ b/node-red-contrib-xiaomi-motion/xiaomi-motion.js
@@ -36,7 +36,6 @@ module.exports = function(RED) {
 
 
                     if (node.output == "0") {
-                        miDevicesUtils.prepareFullDataOutput(payload);
                         node.send([msg]);
                     } else if (node.output == "1") {
                         var status = null;
diff --git a/node-red-contrib-xiaomi-switch/xiaomi-switch.js b/node-red-contrib-xiaomi-switch/xiaomi-switch.js
index 0ce353d..fd5938d 100644
--- a/node-red-contrib-xiaomi-switch/xiaomi-switch.js
+++ b/node-red-contrib-xiaomi-switch/xiaomi-switch.js
@@ -26,7 +26,6 @@ module.exports = function(RED) {
                     miDevicesUtils.setStatus(node, data);
 
                     if (node.output == "0") {
-                        miDevicesUtils.prepareFullDataOutput(payload);
                         node.send([msg]);
                     } else if (node.output == "1") {
                         var status = null;