diff --git a/rrd.py b/rrd.py
index e107f4c..7ca40d6 100755
--- a/rrd.py
+++ b/rrd.py
@@ -79,10 +79,16 @@ class rrd:
              ,'--start',str(round(self.currentTimeInt - 60))
              ,'--step' , '60'
              ,'DS:upstate:GAUGE:120:0:1'
-             ,'RRA:LAST:0:1:44640'
-             # Number of client available
-             ,'DS:clients:GAUGE:120:0:U'
-             ,'RRA:LAST:0:1:44640'
+             ,'RRA:AVERAGE:0.5:1:120'
+             ,'RRA:AVERAGE:0.5:5:1440'
+             ,'RRA:AVERAGE:0.5:60:720'
+             ,'RRA:AVERAGE:0.5:720:730'
+             # Number of connected clients
+             ,'DS:clients:GAUGE:120:0:200'
+             ,'RRA:AVERAGE:0.5:1:120'
+             ,'RRA:AVERAGE:0.5:5:1440'
+             ,'RRA:AVERAGE:0.5:60:720'
+             ,'RRA:AVERAGE:0.5:720:730'
              ]
       subprocess.check_output(args)