diff --git a/mdot/mqttArchiver.censis/mqttArchiver.censis/lib/mqtt/mqttClient.js b/mdot/mqttArchiver.censis/mqttArchiver.censis/lib/mqtt/mqttClient.js
index e3244f6..29ca680 100644
--- a/mdot/mqttArchiver.censis/mqttArchiver.censis/lib/mqtt/mqttClient.js
+++ b/mdot/mqttArchiver.censis/mqttArchiver.censis/lib/mqtt/mqttClient.js
@@ -11,14 +11,6 @@ var requestify = require('requestify');
 var db = require('../server/db-connector').dbConnection;
 
 var dbSave = require('../server/db-save')(db);
-var pusher = require('../pusher');
-
-//var nano = require('nano')('http://martind2000:1V3D4m526i@localhost:5984');
-/*
- var nano = require('nano')('http://localhost:5984');
- var db_name = 'mqttarchive';
- var dbCouch = nano.use(db_name);
- */
 
 //let remoteHost = process.env.NODE_ENV === 'production' ? 'http://mdotserver.mybluemix.net/apiv2/message' : 'http://localhost:3011/apiv2/message';
 const remoteHost = process.env.NODE_ENV === 'production' ? 'http://ec2-52-211-111-57.eu-west-1.compute.amazonaws.com/apiv2/message' : 'http://localhost:3011/apiv2/message';
@@ -95,8 +87,7 @@ var watchDogTimeout = () => {
     'Watchdog timeout. Message has not been received for over 20 minutes.');
   logger.warn('Last received:' + lastReceived + 'Now:' + now);
 
-  pusher.push(
-    'Watchdog timeout. Message has not been received for over 20 Minutes. \n\nLast received:' + lastReceived + 'Now:' + now);
+
   wdTimedOut = true;
 };
 
@@ -113,6 +104,8 @@ var mqttClient = function() {
 
   this.connected = false;
 
+  this.logged = [{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}];
+
   var options = {
     keepalive: 10,
     clientId: 'a:' + orgId + ':' + Date.now(),
@@ -123,6 +116,8 @@ var mqttClient = function() {
 
   };
 
+  this.deviceIds = ['CENSIS-LoRa-1','CENSIS-LoRa-2','CENSIS-LoRa-3','CENSIS-LoRa-4','HIE-mobile-1','HIE-demo','HIE-mobile-2','HIE-smart-campus-1','HIE-smart-campus-2','HIE-smart-campus-3','HIE-smart-campus-4','HIE-smart-campus-5','HIE-smart-campus-6','HIE-smart-campus-7','HIE-mDot-1'];
+
   logger.info('Connecting to ', connection);
   //this.client = mqtt.connect(connection, options);
   this.client = mqtt.connect('mqtt://' + orgId + address, options);
@@ -178,17 +173,25 @@ var mqttClient = function() {
     json.device = topicArray[4];
     json.event = topicArray[6];
 
-    busEmitter.emit('saveData', json);
+    var did = this.deviceIds.indexOf(json.device);
+    console.log('DdeviceID',did);
+
+    logger.info('Dif?:', this.logged[did].data !== json.data);
+
+
+   // busEmitter.emit('saveData', json);
+    this.logged[did] = json;
+   // logger.info('current:', this.logged[did]);
     //console.log(json.type);
     if (json.type !== 'Ti-CC3200') {
-      console.log(json);
+     // console.log(json);
       clearTimeout(watchDog);
       watchDog = setTimeout(watchDogTimeout, 1200000);
       if (wdTimedOut) {
         var now = new Date();
         var s = 'Receiving again :::\n\nLast received: ' + lastReceived + 'Now: ' + now + "\n\n" + message.toString();
         logger.warn(s);
-        pusher.push(s);
+
         wdTimedOut = false;
       }
       lastReceived = new Date();
diff --git a/mdot/mqttArchiver/mqttArchiver/lib/mqtt/mqttClient.js b/mdot/mqttArchiver/mqttArchiver/lib/mqtt/mqttClient.js
index ebfa33b..df30f58 100644
--- a/mdot/mqttArchiver/mqttArchiver/lib/mqtt/mqttClient.js
+++ b/mdot/mqttArchiver/mqttArchiver/lib/mqtt/mqttClient.js
@@ -104,6 +104,8 @@ var mqttClient = function() {
 
   this.connected = false;
 
+  this.logged = [{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}];
+
   var options = {
     keepalive: 10,
     clientId: 'a:' + orgId + ':' + Date.now(),
@@ -114,6 +116,8 @@ var mqttClient = function() {
 
   };
 
+  this.deviceIds = ['CENSIS-LoRa-1','CENSIS-LoRa-2','CENSIS-LoRa-3','CENSIS-LoRa-4','HIE-mobile-1','HIE-demo','HIE-mobile-2','HIE-smart-campus-1','HIE-smart-campus-2','HIE-smart-campus-3','HIE-smart-campus-4','HIE-smart-campus-5','HIE-smart-campus-6','HIE-smart-campus-7','HIE-mDot-1'];
+
   logger.info('Connecting to ', connection);
   //this.client = mqtt.connect(connection, options);
   this.client = mqtt.connect('mqtt://' + orgId + address, options);
@@ -168,10 +172,18 @@ var mqttClient = function() {
     json.device = topicArray[4];
     json.event = topicArray[6];
 
-    busEmitter.emit('saveData', json);
+    var did = this.deviceIds.indexOf(json.device);
+    console.log('DdeviceID',did);
+
+    logger.info('Dif?:', this.logged[did].data !== json.data);
+
+
+   // busEmitter.emit('saveData', json);
+    this.logged[did] = json;
+   // logger.info('current:', this.logged[did]);
     //console.log(json.type);
     if (json.type !== 'Ti-CC3200') {
-      console.log(json);
+     // console.log(json);
       clearTimeout(watchDog);
       watchDog = setTimeout(watchDogTimeout, 1200000);
       if (wdTimedOut) {