diff --git a/html/includes/graphs/atmvp_bits.inc.php b/html/includes/graphs/atmvp_bits.inc.php
new file mode 100644
index 000000000..4000cccc4
--- /dev/null
+++ b/html/includes/graphs/atmvp_bits.inc.php
@@ -0,0 +1,22 @@
+<?php
+
+if($_GET['id']) { $atm_vp_id = $_GET['id']; }
+
+$sql =  "SELECT * FROM `juniAtmVp` as J, `ports` AS I, `devices` AS D";
+$sql .= " WHERE J.juniAtmVp_id = '".$atm_vp_id."' AND I.interface_id = J.interface_id AND I.device_id = D.device_id";
+
+$query = mysql_query($sql);
+$vp = mysql_fetch_array($query);
+
+
+$rrd_test = $config['rrd_dir'] . "/" . $vp['hostname'] . "/" . safename("vp-" . $vp['ifIndex'] . "-".$vp['vp_id'].".rrd");
+if(is_file($rrd_test)) {
+  $rrd_filename = $rrd_test;
+}
+
+$rra_in = "inpacketoctets";
+$rra_out = "outpacketoctets";
+
+include("generic_bits.inc.php");
+
+?>
diff --git a/html/includes/graphs/atmvp_cells.inc.php b/html/includes/graphs/atmvp_cells.inc.php
new file mode 100644
index 000000000..88966210e
--- /dev/null
+++ b/html/includes/graphs/atmvp_cells.inc.php
@@ -0,0 +1,33 @@
+<?php
+
+if($_GET['id']) { $atm_vp_id = $_GET['id']; }
+
+$sql =  "SELECT * FROM `juniAtmVp` as J, `ports` AS I, `devices` AS D";
+$sql .= " WHERE J.juniAtmVp_id = '".$atm_vp_id."' AND I.interface_id = J.interface_id AND I.device_id = D.device_id";
+
+$query = mysql_query($sql);
+$vp = mysql_fetch_array($query);
+
+
+$rrd_test = $config['rrd_dir'] . "/" . $vp['hostname'] . "/" . safename("vp-" . $vp['ifIndex'] . "-".$vp['vp_id'].".rrd");
+if(is_file($rrd_test)) {
+  $rrd_filename = $rrd_test;
+}
+
+$rra_in = "incells";
+$rra_out = "outcells";
+
+$colour_area_in = "AA66AA";
+$colour_line_in = "330033";
+$colour_area_out = "FFDD88";
+$colour_line_out = "FF6600";
+
+$colour_area_in_max = "cc88cc";
+$colour_area_out_max = "FFefaa";
+
+$graph_max = 1;
+$unit_text = "Cells";
+
+include("generic_duplex.inc.php");
+
+?>
diff --git a/html/includes/graphs/atmvp_errors.inc.php b/html/includes/graphs/atmvp_errors.inc.php
new file mode 100644
index 000000000..ca72fe05b
--- /dev/null
+++ b/html/includes/graphs/atmvp_errors.inc.php
@@ -0,0 +1,34 @@
+<?php
+
+if($_GET['id']) { $atm_vp_id = $_GET['id']; }
+
+$sql =  "SELECT * FROM `juniAtmVp` as J, `ports` AS I, `devices` AS D";
+$sql .= " WHERE J.juniAtmVp_id = '".$atm_vp_id."' AND I.interface_id = J.interface_id AND I.device_id = D.device_id";
+
+$query = mysql_query($sql);
+$vp = mysql_fetch_array($query);
+
+
+$rrd_test = $config['rrd_dir'] . "/" . $vp['hostname'] . "/" . safename("vp-" . $vp['ifIndex'] . "-".$vp['vp_id'].".rrd");
+if(is_file($rrd_test)) {
+  $rrd_filename = $rrd_test;
+}
+
+$rra_in = "inpacketerrors";
+$rra_out = "outpacketerrors";
+
+$colour_area_in = "FF3300";
+$colour_line_in = "FF0000";
+$colour_area_out = "FF6633";
+$colour_line_out = "CC3300";
+
+$colour_area_in_max = "FF6633";
+$colour_area_out_max = "FF9966";
+
+$graph_max = 1;
+
+$unit_text = "Errors";
+
+include("generic_duplex.inc.php");
+
+?>
diff --git a/html/includes/graphs/atmvp_packets.inc.php b/html/includes/graphs/atmvp_packets.inc.php
new file mode 100644
index 000000000..d67f55daa
--- /dev/null
+++ b/html/includes/graphs/atmvp_packets.inc.php
@@ -0,0 +1,33 @@
+<?php
+
+if($_GET['id']) { $atm_vp_id = $_GET['id']; }
+
+$sql =  "SELECT * FROM `juniAtmVp` as J, `ports` AS I, `devices` AS D";
+$sql .= " WHERE J.juniAtmVp_id = '".$atm_vp_id."' AND I.interface_id = J.interface_id AND I.device_id = D.device_id";
+
+$query = mysql_query($sql);
+$vp = mysql_fetch_array($query);
+
+
+$rrd_test = $config['rrd_dir'] . "/" . $vp['hostname'] . "/" . safename("vp-" . $vp['ifIndex'] . "-".$vp['vp_id'].".rrd");
+if(is_file($rrd_test)) {
+  $rrd_filename = $rrd_test;
+}
+
+$rra_in = "inpackets";
+$rra_out = "outpackets";
+
+$colour_area_in = "AA66AA";
+$colour_line_in = "330033";
+$colour_area_out = "FFDD88";
+$colour_line_out = "FF6600";
+
+$colour_area_in_max = "cc88cc";
+$colour_area_out_max = "FFefaa";
+
+$graph_max = 1;
+$unit_text = "Packets";
+
+include("generic_duplex.inc.php");
+
+?>
diff --git a/html/pages/device/interface.inc.php b/html/pages/device/interface.inc.php
index 5f0a8032d..ce6bd685b 100644
--- a/html/pages/device/interface.inc.php
+++ b/html/pages/device/interface.inc.php
@@ -68,7 +68,7 @@ echo ("<a href='".$config['base_url']."/device/" . $device['device_id'] . "/inte
 
  if(mysql_result(mysql_query("SELECT COUNT(*) FROM juniAtmVp WHERE interface_id = '".$interface['interface_id']."'"),0) > "0"){
    echo(" | ATM VPs :");
-   echo(" <a href='".$config['base_url']."/device/" . $device['device_id'] . "/interface/".$interface['interface_id']."/junose-atm-vp/octets/'>Bits</a>");
+   echo(" <a href='".$config['base_url']."/device/" . $device['device_id'] . "/interface/".$interface['interface_id']."/junose-atm-vp/bits/'>Bits</a>");
    echo(" | <a href='".$config['base_url']."/device/" . $device['device_id'] . "/interface/".$interface['interface_id']."/junose-atm-vp/packets/'>Packets</a>");
    echo(" | <a href='".$config['base_url']."/device/" . $device['device_id'] . "/interface/".$interface['interface_id']."/junose-atm-vp/cells/'>Cells</a>");
    echo(" | <a href='".$config['base_url']."/device/" . $device['device_id'] . "/interface/".$interface['interface_id']."/junose-atm-vp/errors/'>Errors</a>");
diff --git a/html/pages/device/port/junose-atm-vp.inc.php b/html/pages/device/port/junose-atm-vp.inc.php
index e261aa70d..ac1076ea2 100644
--- a/html/pages/device/port/junose-atm-vp.inc.php
+++ b/html/pages/device/port/junose-atm-vp.inc.php
@@ -1,19 +1,7 @@
 <?php
 
-function print_graph ($args) {
-
-  global $config;
-
-  $sep = "?";
-  $url = $config['base_url'] . "/graph.php";
-  foreach ($args as $arg) {
-    $url .= $sep.$arg;
-  }
-
-  return "<img src=\"".$url."\" border=0>";
-
-}
-
+  if($_GET['optc']) { $graph_type =  "atmvp_".$_GET['optc']; }
+  if(!$graph_type) { $graph_type = "atmvp_bits"; }
 
   echo("<table cellspacing=0 cellpadding=5 border=0>");
 
@@ -23,39 +11,21 @@ function print_graph ($args) {
     echo('<td>VP'.$vp['vp_id'].' '.$vp['vp_descr'].'</td>');
     echo('</tr>');
 
-    $graph_array['height'] = "150";
-    $graph_array['width']  = "150";
+    $graph_array['height'] = "100";
+    $graph_array['width']  = "215";
     $graph_array['to']     = $now;
     $graph_array['id']     = $vp['juniAtmVp_id'];
-    $graph_array['type']   = "juniAtmVp_".$_GET['optc'];
-    
-    
-
-
-  if(!$graph_type) { $graph_type = "pagp_bits"; }
-
-  $daily_traffic   = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&type=$graph_type&from=$day&to=$now&width=215&height=100";
-  $daily_url       = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&type=$graph_type&from=$day&to=$now&width=500&height=150";
-
-  $weekly_traffic  = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&type=$graph_type&from=$week&to=$now&width=215&height=100";
-  $weekly_url      = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&type=$graph_type&from=$week&to=$now&width=500&height=150";
-
-  $monthly_traffic = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&type=$graph_type&from=$month&to=$now&width=215&height=100";
-  $monthly_url     = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&type=$graph_type&from=$month&to=$now&width=500&height=150";
-
-  $yearly_traffic  = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&type=$graph_type&from=$year&to=$now&width=215&height=100";
-  $yearly_url      = $config['base_url'] . "/graph.php?port=" . $interface['interface_id'] . "&type=$graph_type&from=$year&to=$now&width=500&height=150";
-
-  echo("<a href='/device/".$device['device_id']."/interface/".$interface['interface_id']."/' onmouseover=\"return overlib('<img src=\'$daily_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">
-        <img src='$daily_traffic' border=0></a> ");
-  echo("<a href='/device/".$device['device_id']."/interface/".$interface['interface_id']."/' onmouseover=\"return overlib('<img src=\'$weekly_url\'>', LEFT".$config['overlib_defaults'].");\" onmouseout=\"return nd();\">
-        <img src='$weekly_traffic' border=0></a> ");
-  echo("<a href='/device/".$device['device_id']."/interface/".$interface['interface_id']."/' onmouseover=\"return overlib('<img src=\'$monthly_url\'>', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\">
-        <img src='$monthly_traffic' border=0></a> ");
-  echo("<a href='/device/".$device['device_id']."/interface/".$interface['interface_id']."/' onmouseover=\"return overlib('<img src=\'$yearly_url\'>', LEFT".$config['overlib_defaults'].", WIDTH, 350);\" onmouseout=\"return nd();\">
-        <img src='$yearly_traffic' border=0></a>");
+    $graph_array['type']   = $graph_type;
 
+    $periods = array('day', 'week', 'month', 'year');
 
+    echo("<tr><td>");
+    foreach($periods as $period) {
+      $graph_array['from']     = $$period;
+      $graph_array_zoom   = $graph_array; $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400";
+      echo(overlib_link($_SERVER['REQUEST_URI'], generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom),  NULL));
+    }
+    echo("</td></tr>");
 
   }