diff --git a/httpdocs/js/cubism.rrd-server.js b/httpdocs/js/cubism.rrd-server.js
index b3f579bfee..60bf940662 100644
--- a/httpdocs/js/cubism.rrd-server.js
+++ b/httpdocs/js/cubism.rrd-server.js
@@ -1,6 +1,77 @@
-/* Adapted from https://github.com/cliffeh/cubism-rrdserver */
+/*
+ * This file provides cubism.js data. Two modes are available:
+ *  - RRD: get data from RRD.
+ *  - LIVE: get data live counters.
+ * 
+ */
 
-cubism.rrdserver = function(context) {
+
+cubism.rrdserver = function(context, resolution) {
+  /*
+   * live window keeps previous values of each live counter to work with cubism.js queries.
+   * This should be as near to resolution as possible.
+   * High values decrese performance but also increase data retention across mode change.
+   */
+  var LIVE_WINDOW_SIZE = Math.floor(resolution * 0.7);
+
+  function getRelevantValue(up, down, bg, showbg) {
+    if (showbg)
+      return bg;
+    return up >= down ? -up : down;
+  }
+  
+  var LiveCounter = function (step, isbg) {
+    this.reset = function(step, isbg) {
+      this.up = 0;
+      this.down = 0;
+      this.bg = 0;
+      this.lastpoll = -1;
+      this.step = step;
+      this.live_window = new Array(LIVE_WINDOW_SIZE).fill(0);
+      this.isbg = isbg;
+    }
+
+    this.isValidTime = function(stop) {
+      return this.lastpoll==-1 ? true : (stop - this.lastpoll >= this.step);
+    }
+
+    this.update = function(stop, up, down, bg) {
+      if (this.lastpoll != -1) {
+        // adjust the window
+        this.scrollWindow(stop);
+        this.live_window[LIVE_WINDOW_SIZE-1] = getRelevantValue(up-this.up, down-this.down, bg-this.bg, this.isbg)
+      }
+
+      this.up = up;
+      this.down = down;
+      this.bg = bg;
+      this.lastpoll = stop;
+    }
+
+    this.scrollWindow = function(stop) {
+      var scroll = (stop - this.lastpoll) / this.step;
+      var i;
+      
+      for (i=0; i+scroll<LIVE_WINDOW_SIZE; i++)
+        this.live_window[i] = this.live_window[i+scroll];
+      for (; i<LIVE_WINDOW_SIZE; i++)
+        this.live_window[i] = 0;
+
+      this.lastpoll = stop;
+    }
+
+    this.getAt = function(i) {
+      return this.live_window[i];
+    }
+
+    this.reset(step, isbg);
+  }
+
+  /* active and background counters */
+  var live_counters = [{},{}];
+  var live_window = [];
+  var live_step = -1;
+  
   var source = {};
 
   var getMetric = function(rrd, name, showbg, cf) {
@@ -16,34 +87,50 @@ cubism.rrdserver = function(context) {
 	      + '&stop=' + stop
 	      + '&step=' + step,
 		function(data) {
+      var datasize = (data && data.bg) ? data.bg.length : 0;
+      if (datasize == 0)
+        return;
+      
       var datastep = data['step'] * 1000;
       var up = data['up'];
       var down = data['down'];
       var bg = data['bg'];
-      var datasize = bg.length;
-
-      var k = Math.ceil(step / datastep);
+      var livemode = data['live'];
       var res = [];
-      var upval = 0;
-      var downval = 0;
-      var i;
 
-      // aggregate data: TODO test with step != 60*1000
-      for (i=0; i<datasize; i++) {
-        if (showbg) {
-          downval += bg[i];
-        } else {
-          upval += up[i];
-          downval += down[i];
+      if (livemode) {
+        if (live_step != step) {
+          live_step = step;
+
+          for (var i=0; i<2; i++)
+            for (var k in live_counters[i])
+              live_counters[i][k].reset(live_step, i===1);
+        }        
+
+        for (var i=0; i<2; i++) {
+          if (! live_counters[i].hasOwnProperty(name))
+            live_counters[i][name] = new LiveCounter(live_step, i===1);
+
+          if (live_counters[i][name].isValidTime(stop))
+            live_counters[i][name].update(stop, up[0], down[0], bg[0]);
         }
 
-        if (i % k == k-1) {
-          // majority vote
-          res.push(upval >= downval ? -upval : downval);
-          upval = downval = 0;
+        var counter = live_counters[showbg ? 1 : 0][name];
+
+        // fill the gaps with saved values or zeroes
+        var points = (stop - start) / step;
+        for (var i=0; i<points; i++) {
+          var j = LIVE_WINDOW_SIZE - points + i;
+          if (j >= 0)
+            res.push(counter.getAt(j));
+          else
+            res.push(0);
         }
+      } else {
+        for (var i=0; i<datasize; i++)
+          res.push(getRelevantValue(up[i], down[i], bg[i], showbg));
       }
-      
+
       callback(null, res);
 		});
     }, name);
diff --git a/scripts/lua/get_host_activity.lua b/scripts/lua/get_host_activity.lua
index 529b65405e..322458dde4 100644
--- a/scripts/lua/get_host_activity.lua
+++ b/scripts/lua/get_host_activity.lua
@@ -13,6 +13,8 @@ sendHTTPHeader('text/html; charset=iso-8859-1')
 -- mandatory parameters: host(as ip), ifid
 local res = {}
 
+local MIN_STEP = 300
+
 local name_map = {
       { "Chat", "Chat and Realtime Communications" },
       { "RemoteControl", "Remote Access" },
@@ -49,42 +51,80 @@ function mapnametoRRD(name)
   return(name)
 end
 
-if (_GET["host"] ~= nil and _GET["ifid"] ~= nil) then
+if (_GET["host"] ~= nil and _GET["ifid"] ~= nil and _GET["step"] ~= nil) then
    local host_info = url2hostinfo(_GET)
    local ifId = _GET["ifid"]
-   local hostbase = dirs.workingdir .. "/" .. ifId .. "/rrd/" .. getPathFromKey(hostinfo2hostkey(host_info))
+   local host = hostinfo2hostkey(host_info)
+   local hostbase = dirs.workingdir .. "/" .. ifId .. "/rrd/" .. getPathFromKey(host)
    local activbase = hostbase .. "/activity"
+   local actname = mapnametoRRD(_GET["activity"])
 
-   if ntop.isdir(activbase) then
+   local islive = _GET["step"] and tonumber(_GET["step"]) < MIN_STEP
+   local fetchData = false
+   local rrd
+
+   if islive then
       if not _GET["activity"] then
          -- mode=list
-         for key,value in pairs(ntop.readdir(activbase)) do
-            if string.ends(key, ".rrd") then
-               table.insert(res, mapRRDname(string.sub(key, 1, -5)))
+         interface.select(ifId)
+         local activities = interface.getHostActivity(host)
+         if activities then
+            for key,value in pairs(activities) do
+               table.insert(res, mapRRDname(key))
             end
          end
       else
          -- mode=get
+         fetchData = true
+      end
+   else
+      if ntop.isdir(activbase) then
+         if not _GET["activity"] then
+            -- mode=list
+            for key,value in pairs(ntop.readdir(activbase)) do
+               if string.ends(key, ".rrd") then
+                  table.insert(res, mapRRDname(string.sub(key, 1, -5)))
+               end
+            end
+         else
+            -- mode=get
+            rrd = activbase.."/"..actname..".rrd"
+            
+            if(ntop.notEmptyFile(rrd)) then
+               fetchData = true
+            end
+         end
+      end
+   end
+
+   if fetchData then
+      res.live = islive
+      res.step = (res.live and _GET["step"]) or fstep
+      res.up = {}
+      res.down = {}
+      res.bg = {}
+
+      if islive then
+         interface.select(ifId)
+         local activity = interface.getHostActivity(host)
+         if activity and activity[actname] then
+            local data = activity[actname]
+            table.insert(res.up, data.up)
+            table.insert(res.down, data.down)
+            table.insert(res.bg, data.background)
+         end
+      else
          local start_time = tonumber(_GET["start"])
          local end_time = tonumber(_GET["stop"])
          local cf = _GET["cf"] or "AVERAGE"
-
-         local rrd = activbase.."/"..mapnametoRRD(_GET["activity"])..".rrd"
+         local fstart, fstep, fnames, fdata = ntop.rrd_fetch(rrd, cf, start_time, end_time)
          
-         if(ntop.notEmptyFile(rrd)) then
-            local fstart, fstep, fnames, fdata = ntop.rrd_fetch(rrd, cf, start_time, end_time)
-            res.step = fstep
-            res.up = {}
-            res.down = {}
-            res.bg = {}
+         function getValue(w) if w ~= w then return 0 else return math.max(tonumber(w), 0) end end
 
-            function getValue(w) if w ~= w then return 0 else return math.max(tonumber(w), 0) end end
-
-            for i, v in ipairs(fdata) do
-               table.insert(res.up, getValue(v[1])*fstep)
-               table.insert(res.down, getValue(v[2])*fstep)
-               table.insert(res.bg, getValue(v[3])*fstep)
-            end
+         for i, v in ipairs(fdata) do
+            table.insert(res.up, getValue(v[1])*fstep)
+            table.insert(res.down, getValue(v[2])*fstep)
+            table.insert(res.bg, getValue(v[3])*fstep)
          end
       end
    end
diff --git a/scripts/lua/host_details.lua b/scripts/lua/host_details.lua
index f4f576adaa..0c907b9a61 100644
--- a/scripts/lua/host_details.lua
+++ b/scripts/lua/host_details.lua
@@ -1074,11 +1074,22 @@ print [[
 if host["localhost"] == true then
    print [[ <tr><th>Protocol Activity</th><td colspan=2>
       <div style='margin-top:0.5em;'>
-         <input type="radio" name="showmode" value="updown" onclick="setShowMode(this.value)" checked> User Traffic<br>
-         <input type="radio" name="showmode" value="bg" onclick="setShowMode(this.value)"> Background Traffic
+         <input type="radio" name="showmode" value="updown" onclick="if(this.value != curmode) setShowMode(this.value);" checked> User Traffic<br>
+         <input type="radio" name="showmode" value="bg" onclick="if(this.value != curmode) setShowMode(this.value);"> Background Traffic
       </div>
 
-      <div id="userctivity" style='margin:2em 0 2em 0;'></div>
+      <div id="userctivityContainer"></div>
+
+      <div style='margin-bottom:1em;'>
+	 Resolution:&nbsp;
+	 <select onchange="onChangeStep(this);">
+	   <option value="300" selected="selected">5 min</option>
+	   <option value="60">1 min (realtime)</option>
+	   <option value="10">10 sec (realtime)</option>
+	   <option value="5">5 sec (realtime)</option>
+	   <option value="1">1 sec (realtime)</option>
+	 </select>
+      </div>
 
       <script src="]] print(ntop.getHttpPrefix()) print [[/js/cubism.v1.js"></script>
       <script src="]] print(ntop.getHttpPrefix()) print [[/js/cubism.rrd-server.js"></script>
@@ -1087,18 +1098,13 @@ if host["localhost"] == true then
       </style>
       
          <script type="text/javascript">
-         var HorizonGraphWidth = 576
-         var context = cubism.context().size(HorizonGraphWidth).step(300*1000);//.stop();
-         var horizon = context.horizon();
-
-         $('#userctivity')
-            .css("position", "relative")
-            .css("width", HorizonGraphWidth)
-
-         // to set labels place on mousemove
-         context.on("focus", function(i) {
-            d3.selectAll(".value").style("right", i == null ? null : context.size() - i + "px");
-         });
+	 var activitiesurl = "]] print(ntop.getHttpPrefix().."/lua/get_host_activity.lua?ifid="..ifId.."&host="..host_ip) print[[";
+         var HorizonGraphWidth = 576;
+	 var curmode = "updown";
+	 var curstep = 0;
+         var context = null;
+         var horizon = null;
+	 var rrdserver = null;
 
          function formatBytes(bytes, precision) {
             var sizes = [1, 1024, 1024*1024, 1024*1024*1024, 1024*1024*1024*1024];
@@ -1115,13 +1121,60 @@ if host["localhost"] == true then
             return value.toFixed(precision) + labels[i];
          }
 
-         function setShowMode(mode) {
+	 function onChangeStep(control) {
+	    var newvalue = control.value;
+	    
+	    if (curstep != newvalue) {
+	       $(control).blur();
+	       setShowMode(curmode, newvalue);
+	    }
+	 }
+
+	 function resetContext(newstep) {	 
+	    if (newstep != curstep) {
+	       // hard reset
+	       curstep = newstep;
+	       $('#userctivity').remove();
+
+	       if (context) {
+		  context.stop();
+		  delete rrdserver;
+		  delete horizon;
+		  delete context;
+	       }
+
+	       var div = $('<div id="userctivity"></div>')
+		  .css("margin", "2em 0 1em 0")
+		  .css("position", "relative")
+		  .css("width", HorizonGraphWidth);
+	       $('#userctivityContainer').append(div);
+
+	       context = cubism.context().size(HorizonGraphWidth).step(curstep*1000);
+	       horizon = context.horizon();
+	       rrdserver = cubism.rrdserver(context, HorizonGraphWidth);
+
+	       // to set labels place on mousemove
+	       context.on("focus", function(i) {
+		  d3.selectAll(".value").style("right", i == null ? null : context.size() - i + "px");
+	       });
+	    } else {
+	       // soft reset
+	       d3.selectAll(".horizon").remove();
+	       $('#userctivity').empty();
+	    }
+	 }
+
+         function setShowMode(mode, newstep) {
+	    curmode = mode;
+	    newstep = newstep ? newstep : curstep;
+	    if (context)
+	       context.stop();
+	    
             $.ajax({
                type: 'GET',
-               url: activitiesurl,
+               url: activitiesurl + '&step=' + newstep,
                success: function(content) {
-                  d3.selectAll(".horizon").remove();
-                  $('#userctivity').empty();
+		  resetContext(newstep);
                   
                   var metrics = [];
                   JSON.parse(content).sort().map(function(activity) {
@@ -1147,17 +1200,16 @@ if host["localhost"] == true then
 			.append("div")
 			.attr("class", "rule")
 			.call(context.rule());
+
+		     context.start();
 		  } else {
 		     $('#userctivity').text("No data so far");
 		  }
                }
             });
          }
-
-         var rrdserver = cubism.rrdserver(context);
-         var activitiesurl = "]] print(ntop.getHttpPrefix().."/lua/get_host_activity.lua?ifid="..ifId.."&host="..host_ip) print[[";
-
-         setShowMode("updown");
+	 
+         setShowMode("updown", 300);
       </script>
       <p>
       <b>NOTE:</b><br>The above map filters host application traffic by splitting it in real user reaffic (e.g. web page access)