diff --git a/src/se/koc/hal/PowerChallenge.java b/src/se/koc/hal/PowerChallenge.java
index ffb3e165..b394b395 100755
--- a/src/se/koc/hal/PowerChallenge.java
+++ b/src/se/koc/hal/PowerChallenge.java
@@ -2,6 +2,7 @@ package se.koc.hal;
 
 
 import se.koc.hal.deamon.DataAggregatorDaemon;
+import se.koc.hal.deamon.DataSynchronizationClient;
 import se.koc.hal.deamon.DataSynchronizationDaemon;
 import se.koc.hal.deamon.HalDaemon;
 import se.koc.hal.page.PCConfigureHttpPage;
@@ -24,7 +25,8 @@ public class PowerChallenge {
 	
     private static HalDaemon[] daemons = new HalDaemon[]{
             new DataAggregatorDaemon(),
-            new DataSynchronizationDaemon()
+            new DataSynchronizationDaemon(),
+            new DataSynchronizationClient()
     };
 
     public static void main(String[] args) throws Exception {
diff --git a/src/se/koc/hal/deamon/DataSynchronizationClient.java b/src/se/koc/hal/deamon/DataSynchronizationClient.java
index 375cf290..e7d6593f 100644
--- a/src/se/koc/hal/deamon/DataSynchronizationClient.java
+++ b/src/se/koc/hal/deamon/DataSynchronizationClient.java
@@ -56,7 +56,8 @@ public class DataSynchronizationClient extends TimerTask implements HalDaemon{
 						SensorDataListDTO dataList = (SensorDataListDTO) in.readObject();
 						for(SensorDataDTO data : dataList){
 							int deletions = db.exec("DELETE FROM sensor_data_aggr WHERE sensor_id == "+ sensor.getId() +" AND "+ data.timestampStart +" <= timestamp_start AND timestamp_end <= "+ data.timestampEnd);
-							logger.finer("Aggregate data replaced "+ deletions +" entries");
+							if(deletions > 0)
+								logger.finer("Aggregate data replaced "+ deletions +" entries");
 							db.exec(String.format(Locale.US, "INSERT INTO sensor_data_aggr(sensor_id, sequence_id, timestamp_start, timestamp_end, data, confidence) VALUES(%d, %d, %d, %d, %d, %f)",
 									sensor.getId(),
 									data.sequenceId,
@@ -66,6 +67,10 @@ public class DataSynchronizationClient extends TimerTask implements HalDaemon{
 									data.confidence));
 						}
 					}
+					out.writeObject(null);
+					out.close();
+					in.close();
+					s.close();
 					
 				} catch (UnknownHostException e) {
 					e.printStackTrace();
@@ -84,7 +89,7 @@ public class DataSynchronizationClient extends TimerTask implements HalDaemon{
 
 
 	///////////////  DTO ///////////////////////
-	protected class PeerDataReqDTO implements Serializable{
+	protected static class PeerDataReqDTO implements Serializable{
 		private static final long serialVersionUID = -9066734025245139989L;
 		
 		public long sensorId;
diff --git a/src/se/koc/hal/deamon/DataSynchronizationDaemon.java b/src/se/koc/hal/deamon/DataSynchronizationDaemon.java
index 45b9e21f..d28f79d6 100644
--- a/src/se/koc/hal/deamon/DataSynchronizationDaemon.java
+++ b/src/se/koc/hal/deamon/DataSynchronizationDaemon.java
@@ -99,11 +99,11 @@ public class DataSynchronizationDaemon extends ThreadedTCPNetworkServer implemen
 	}
 
 	///////////////  DTO ///////////////////////
-	protected class SensorDataListDTO extends ArrayList<SensorDataDTO> implements Serializable{
+	protected static class SensorDataListDTO extends ArrayList<SensorDataDTO> implements Serializable{
 		private static final long serialVersionUID = -5701618637734020691L;	
 	}
 	
-	protected class SensorDataDTO implements Serializable{
+	protected static class SensorDataDTO implements Serializable{
 		private static final long serialVersionUID = 8494331502087736809L;
 		
 		public long sequenceId;