diff --git a/html/graph.php b/html/graph.php
index b22f7098e..8565596cc 100644
--- a/html/graph.php
+++ b/html/graph.php
@@ -68,10 +68,6 @@ if($_GET['debug']) {
   case 'netscreen_memory':
     $graph = graph_netscreen_memory ($hostname . "/netscreen-memory.rrd", $graphfile, $from, $to, $width, $height, $title, $vertical);
     break;
-  case 'multi_bits':
-    if($_GET['if']) { $_GET['interfaces'] = $_GET['if']; }
-    $graph = graph_multi_bits ($_GET['interfaces'], $graphfile, $from, $to, $width, $height, $title, $vertical, $inverse, $legend);
-    break;
   case 'multi_bits_duo':
     $groups = array($_GET['interfaces'], $_GET['interfaces_b']);
     $graph = graph_multi_bits_duo ($groups, $graphfile, $from, $to, $width, $height, $title, $vertical, $inverse, $legend);
@@ -103,9 +99,6 @@ if($_GET['debug']) {
   case 'mac_acc_bits':
     $graph = graph_mac_acc ($_GET['id'], $graphfile, $from, $to, $width, $height, $title, $vertical);
     break;
-  case 'device_bits':
-    $graph = graph_device_bits ($device_id, $graphfile, $from, $to, $width, $height, $title, $vertical, $inverse, $legend);
-    break;  
   case 'bits':
     $graph = graph_bits ($hostname . "/". $ifIndex . ".rrd", $graphfile, $from, $to, $width, $height, $title, $vertical, $inverse, $legend);
     break;
diff --git a/html/includes/graphs/device_bits.inc.php b/html/includes/graphs/device_bits.inc.php
new file mode 100644
index 000000000..d63b7caa7
--- /dev/null
+++ b/html/includes/graphs/device_bits.inc.php
@@ -0,0 +1,19 @@
+<?php
+
+## Generate a list of interfaces and then call the multi_bits grapher to generate from the list
+
+$device = $_GET['device'];
+
+$hostname = gethostbyid($device);
+$query = mysql_query("SELECT `ifIndex`,`interface_id` FROM `interfaces` WHERE `device_id` = '$device' AND `ifType` NOT LIKE '%oopback%' AND `ifType` NOT LIKE '%SVI%' AND `ifType` != 'l2vlan'");
+$pluses = "";
+while($int = mysql_fetch_row($query)) {
+  if(is_file($config['rrd_dir'] . "/" . $hostname . "/" . $int[0] . ".rrd")) {
+    $interfaces .= $seperator . $int[1];
+    $seperator = ",";
+  }
+}
+
+include ("multi_bits.inc.php");
+
+?>
diff --git a/html/includes/graphs/multi_bits.inc.php b/html/includes/graphs/multi_bits.inc.php
new file mode 100644
index 000000000..8098b8001
--- /dev/null
+++ b/html/includes/graphs/multi_bits.inc.php
@@ -0,0 +1,59 @@
+<?php
+
+function graph_multi_bits ($interfaces, $graph, $from, $to, $width, $height, $title, $vertical, $inverse, $legend = '1') {
+  global $config, $installdir;
+  $imgfile = $config['install_dir'] . "/graphs/" . "$graph";
+  $options = "--alt-autoscale-max -E --start $from --end " . ($to - 150) . " --width $width --height $height";
+  $options .= $config['rrdgraph_def_text'];
+  if($height < "99") { $options .= " --only-graph"; }
+  $i = 1;
+  foreach(explode(",", $interfaces) as $ifid) {
+    $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `interfaces` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id");
+    $int = mysql_fetch_row($query);
+    if(is_file($config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd")) {
+      $options .= " DEF:inoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:INOCTETS:AVERAGE";
+      $options .= " DEF:outoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:OUTOCTETS:AVERAGE";
+      $in_thing .= $seperator . "inoctets" . $i . ",UN,0," . "inoctets" . $i . ",IF";
+      $out_thing .= $seperator . "outoctets" . $i . ",UN,0," . "outoctets" . $i . ",IF";
+      $pluses .= $plus;
+      $seperator = ",";
+      $plus = ",+";
+      $i++;
+    }
+  }
+  if($inverse) { $in = 'out'; $out = 'in'; } else { $in = 'in'; $out = 'out'; }
+  $options .= " CDEF:".$in."octets=" . $in_thing . $pluses;
+  $options .= " CDEF:".$out."octets=" . $out_thing . $pluses;
+  $options .= " CDEF:doutoctets=outoctets,-1,*";
+  $options .= " CDEF:inbits=inoctets,8,*";
+  $options .= " CDEF:outbits=outoctets,8,*";
+  $options .= " CDEF:doutbits=doutoctets,8,*";
+  if($legend == "no") {
+   $options .= " AREA:inbits#CDEB8B:";
+   $options .= " LINE1.25:inbits#006600:";
+   $options .= " AREA:doutbits#C3D9FF:";
+   $options .= " LINE1.25:doutbits#000099:";
+  } else {
+   $options .= " AREA:inbits#CDEB8B:";
+   $options .= " COMMENT:BPS\ \ \ \ Current\ \ \ Average\ \ \ \ \ \ Max\\\\n";
+   $options .= " LINE1.25:inbits#006600:In\ ";
+   $options .= " GPRINT:inbits:LAST:%6.2lf%s";
+   $options .= " GPRINT:inbits:AVERAGE:%6.2lf%s";
+   $options .= " GPRINT:inbits:MAX:%6.2lf%s\\\\l";
+   $options .= " AREA:doutbits#C3D9FF:";
+   $options .= " LINE1.25:doutbits#000099:Out";
+   $options .= " GPRINT:outbits:LAST:%6.2lf%s";
+   $options .= " GPRINT:outbits:AVERAGE:%6.2lf%s";
+   $options .= " GPRINT:outbits:MAX:%6.2lf%s";
+  }
+  if($width <= "300") { $options .= " --font LEGEND:7:".$config['mono_font']." --font AXIS:6:".$config['mono_font']." --font-render-mode normal"; }
+  $thing = shell_exec($config['rrdtool'] . " graph $imgfile $options");
+  return $imgfile;
+}
+
+if($_GET['if']) { $interfaces = $_GET['if']; }
+if($_GET['interfaces']) { $interfaces = $_GET['interfaces']; }
+
+$graph = graph_multi_bits ($interfaces, $graphfile, $from, $to, $width, $height, $title, $vertical, $inverse, $legend);
+
+?>
diff --git a/html/includes/print-interface.inc b/html/includes/print-interface.inc
index ee95a2485..621875111 100644
--- a/html/includes/print-interface.inc
+++ b/html/includes/print-interface.inc
@@ -48,8 +48,11 @@
   echo("</td><td width=100>");
 
   if($port_details) {
+    $interface['graph_type'] = "bits";
     echo(generateiflink($interface, "<img src='graph.php?type=bits&if=".$interface['interface_id']."&from=".$day."&to=".$now."&width=100&height=20&legend=no&bg=".str_replace("#","", $row_colour)."'>"));
+    $interface['graph_type'] = "pkts";
     echo(generateiflink($interface, "<img src='graph.php?type=pkts&if=".$interface['interface_id']."&from=".$day."&to=".$now."&width=100&height=20&legend=no&bg=".str_replace("#","", $row_colour)."'>"));
+    $interface['graph_type'] = "errors";
     echo(generateiflink($interface, "<img src='graph.php?type=errors&if=".$interface['interface_id']."&from=".$day."&to=".$now."&width=100&height=20&legend=no&bg=".str_replace("#","", $row_colour)."'>"));
   }
 
diff --git a/includes/functions.php b/includes/functions.php
index e597812e4..68bf81bf2 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -277,15 +277,16 @@ function geteventicon ($message)
   if($icon) { return $icon; } else { return false; }
 }
 
-function generateiflink($interface, $text=0,$type=bits) 
+function generateiflink($interface, $text=0,$type) 
 {
   global $twoday; global $now; global $config; global $day; global $month;
   $interface = ifNameDescr($interface);
   if(!$text) { $text = fixIfName($interface['label']); }
-  if(!$type) { $type = 'bits'; }
+  if($type) { $interface['graph_type'] = $type; }
+  if(!$interface['graph_type']) { $interface['graph_type'] = 'bits'; }
   $class = ifclass($interface['ifOperStatus'], $interface['ifAdminStatus']);
-  $graph_url = $config['base_url'] . "/graph.php?if=" . $interface['interface_id'] . "&from=$day&to=$now&width=400&height=100&type=" . $type;
-  $graph_url_month = $config['base_url'] . "/graph.php?if=" . $interface['interface_id'] . "&from=$month&to=$now&width=400&height=100&type=" . $type;
+  $graph_url = $config['base_url'] . "/graph.php?if=" . $interface['interface_id'] . "&from=$day&to=$now&width=400&height=100&type=" . $interface['graph_type'];
+  $graph_url_month = $config['base_url'] . "/graph.php?if=" . $interface['interface_id'] . "&from=$month&to=$now&width=400&height=100&type=" . $interface['graph_type'];
   $device_id = getifhost($interface['interface_id']);
   $link = "<a class=$class href='".$config['base_url']."/device/$device_id/interface/" . $interface['interface_id'] . "/' ";
   $link .= "onmouseover=\" return overlib('";
@@ -448,20 +449,14 @@ function scanUDP ($host, $port, $timeout)
   } 
   socket_set_timeout ($handle, $timeout); 
   $write = fwrite($handle,"\x00"); 
-  if (!$write) { 
-    next; 
-  } 
+  if (!$write) { next; } 
   $startTime = time(); 
   $header = fread($handle, 1); 
   $endTime = time(); 
   $timeDiff = $endTime - $startTime;  
   if ($timeDiff >= $timeout) { 
-    fclose($handle); 
-    return 1; 
-  } else { 
-    fclose($handle); 
-    return 0; 
-  } 
+    fclose($handle); return 1; 
+  } else { fclose($handle); return 0; } 
 }
 
 function humanmedia($media) 
diff --git a/includes/graphing.php b/includes/graphing.php
index 116f37041..fb47a669d 100644
--- a/includes/graphing.php
+++ b/includes/graphing.php
@@ -286,58 +286,6 @@ function graph_multi_bits_duo ($interfaces, $graph, $from, $to, $width, $height,
   return $imgfile;
 }
 
-
-function graph_multi_bits ($interfaces, $graph, $from, $to, $width, $height, $title, $vertical, $inverse, $legend = '1') {
-  global $config, $installdir;
-  $imgfile = $config['install_dir'] . "/graphs/" . "$graph";
-  $options = "--alt-autoscale-max -E --start $from --end " . ($to - 150) . " --width $width --height $height";
-  $options .= $config['rrdgraph_def_text'];
-  if($height < "99") { $options .= " --only-graph"; }
-  $i = 1;
-  foreach(explode(",", $interfaces) as $ifid) {
-    $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `interfaces` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id");
-    $int = mysql_fetch_row($query);
-    if(is_file($config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd")) {
-      $options .= " DEF:inoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:INOCTETS:AVERAGE";
-      $options .= " DEF:outoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:OUTOCTETS:AVERAGE";
-      $in_thing .= $seperator . "inoctets" . $i . ",UN,0," . "inoctets" . $i . ",IF";
-      $out_thing .= $seperator . "outoctets" . $i . ",UN,0," . "outoctets" . $i . ",IF";
-      $pluses .= $plus;
-      $seperator = ",";
-      $plus = ",+";
-      $i++;
-    }
-  }
-  if($inverse) { $in = 'out'; $out = 'in'; } else { $in = 'in'; $out = 'out'; }
-  $options .= " CDEF:".$in."octets=" . $in_thing . $pluses;
-  $options .= " CDEF:".$out."octets=" . $out_thing . $pluses;
-  $options .= " CDEF:doutoctets=outoctets,-1,*";
-  $options .= " CDEF:inbits=inoctets,8,*";
-  $options .= " CDEF:outbits=outoctets,8,*";
-  $options .= " CDEF:doutbits=doutoctets,8,*";
-  if($legend == "no") {
-   $options .= " AREA:inbits#CDEB8B:";
-   $options .= " LINE1.25:inbits#006600:";
-   $options .= " AREA:doutbits#C3D9FF:";
-   $options .= " LINE1.25:doutbits#000099:";
-  } else {
-   $options .= " AREA:inbits#CDEB8B:";
-   $options .= " COMMENT:BPS\ \ \ \ Current\ \ \ Average\ \ \ \ \ \ Max\\\\n";
-   $options .= " LINE1.25:inbits#006600:In\ ";
-   $options .= " GPRINT:inbits:LAST:%6.2lf%s";
-   $options .= " GPRINT:inbits:AVERAGE:%6.2lf%s";
-   $options .= " GPRINT:inbits:MAX:%6.2lf%s\\\\l";
-   $options .= " AREA:doutbits#C3D9FF:";
-   $options .= " LINE1.25:doutbits#000099:Out";
-   $options .= " GPRINT:outbits:LAST:%6.2lf%s";
-   $options .= " GPRINT:outbits:AVERAGE:%6.2lf%s";
-   $options .= " GPRINT:outbits:MAX:%6.2lf%s";
-  }
-  if($width <= "300") { $options .= " --font LEGEND:7:".$config['mono_font']." --font AXIS:6:".$config['mono_font']." --font-render-mode normal"; }
-  $thing = shell_exec($config['rrdtool'] . " graph $imgfile $options");
-  return $imgfile;
-}
-
 function temp_graph ($temp, $graph, $from, $to, $width, $height, $title, $vertical) {
   global $config, $installdir;
   $options = " -l 0 -E --start $from --end $to --width $width --height $height ";