diff --git a/cbpi/controller/log_file_controller.py b/cbpi/controller/log_file_controller.py
index 968929f..bf10cb2 100644
--- a/cbpi/controller/log_file_controller.py
+++ b/cbpi/controller/log_file_controller.py
@@ -31,8 +31,13 @@ class LogController:
         self.influxdb = self.cbpi.config.get("INFLUXDB", "No")
         if self.logfiles == "Yes":
             if name not in self.datalogger:
+<<<<<<< HEAD
                 max_bytes = int(self.cbpi.config.get("SENSOR_LOG_MAX_BYTES", 100000))
                 backup_count = int(self.cbpi.config.get("SENSOR_LOG_BACKUP_COUNT", 3))
+=======
+                max_bytes = self.cbpi.config.get("SENSOR_LOG_MAX_BYTES", 1048576)
+                backup_count = self.cbpi.config.get("SENSOR_LOG_BACKUP_COUNT", 3)
+>>>>>>> 5ea4160b4f6b7a7c759323cc01b0e40a05bca4b9
     
                 data_logger = logging.getLogger('cbpi.sensor.%s' % name)
                 data_logger.propagate = False
@@ -42,7 +47,7 @@ class LogController:
                 self.datalogger[name] = data_logger
 
             formatted_time = strftime("%Y-%m-%d %H:%M:%S", localtime())
-            self.datalogger[name].info("%s,%s" % (formatted_time, str(value)))
+            self.datalogger[name].info("%s,%s" % (formatted_time, value))
         if self.influxdb == "Yes":
             self.influxdbcloud = self.cbpi.config.get("INFLUXDBCLOUD", "No")
             self.influxdbaddr = self.cbpi.config.get("INFLUXDBADDR", None)
@@ -116,6 +121,7 @@ class LogController:
         for name in names:
             # get all log names
             all_filenames = glob.glob('./logs/sensor_%s.log*' % name)
+
             # concat all logs
             df = pd.concat([pd.read_csv(f, parse_dates=True, date_parser=dateparse, index_col='DateTime', names=['DateTime', name], header=None) for f in all_filenames])
             logging.info("Read all files for {}".format(names))
@@ -124,29 +130,19 @@ class LogController:
                 df = df[name].resample(sample_rate).max()
             logging.info("Sampled now for {}".format(names))
             df = df.dropna()
-            # take every nth row so that total number of rows does not exceed max_rows * 2
-            max_rows = 500
-            total_rows = df.shape[0]
-            if (total_rows > 0) and (total_rows > max_rows):
-                nth = int(total_rows/max_rows)
-                if nth > 1:
-                    df = df.iloc[::nth]
-                    
             if result is None:
                 result = df
             else:
                 result = pd.merge(result, df, how='outer', left_index=True, right_index=True)
 
         data = {"time": df.index.tolist()}
-        
+
         if len(names) > 1:
             for name in names:
                 data[name] = result[name].interpolate(limit_direction='both', limit=10).tolist()
         else:
             data[name] = result.interpolate().tolist()
-
         logging.info("Send Log for {}".format(names))
-        
         return data
 
     async def get_data2(self, ids) -> dict:
@@ -155,12 +151,7 @@ class LogController:
         
         result = dict()
         for id in ids:
-            # df = pd.read_csv("./logs/sensor_%s.log" % id, parse_dates=True, date_parser=dateparse, index_col='DateTime', names=['DateTime',"Values"], header=None) 
-            # concat all logs
-            all_filenames = glob.glob('./logs/sensor_%s.log*' % id)
-            df = pd.concat([pd.read_csv(f, parse_dates=True, date_parser=dateparse, index_col='DateTime', names=['DateTime', 'Values'], header=None) for f in all_filenames])
-            df = df.resample('60s').max()
-            df = df.dropna()
+            df = pd.read_csv("./logs/sensor_%s.log" % id, parse_dates=True, date_parser=dateparse, index_col='DateTime', names=['DateTime',"Values"], header=None) 
             result[id] = {"time": df.index.astype(str).tolist(), "value":df.Values.tolist()}
         return result
 
diff --git a/cbpi/extension/ConfigUpdate/__init__.py b/cbpi/extension/ConfigUpdate/__init__.py
index 9e78ae3..8380e75 100644
--- a/cbpi/extension/ConfigUpdate/__init__.py
+++ b/cbpi/extension/ConfigUpdate/__init__.py
@@ -47,9 +47,8 @@ class ConfigUpdate(CBPiExtension):
         influxdbcloud = self.cbpi.config.get("INFLUXDBCLOUD", None)
         mqttupdate = self.cbpi.config.get("MQTTUpdate", None)
         PRESSURE_UNIT = self.cbpi.config.get("PRESSURE_UNIT", None)
-        SENSOR_LOG_BACKUP_COUNT = self.cbpi.config.get("SENSOR_LOG_BACKUP_COUNT", None)
-        SENSOR_LOG_MAX_BYTES = self.cbpi.config.get("SENSOR_LOG_MAX_BYTES", None)
-        
+
+
         if boil_temp is None:
             logger.info("INIT Boil Temp Setting")
             try: