diff --git a/discovery.php b/discovery.php
index de7fa12f6f..0001685036 100755
--- a/discovery.php
+++ b/discovery.php
@@ -114,7 +114,7 @@ while ($device = mysql_fetch_array($device_query))
   #include("includes/discovery/os.inc.php");
 
   include("includes/discovery/ports.inc.php");
-  include("includes/discovery/entity-physical.inc.php");
+#  include("includes/discovery/entity-physical.inc.php");
   include("includes/discovery/processors.inc.php");
   include("includes/discovery/mempools.inc.php");
   include("includes/discovery/ipv4-addresses.inc.php");
diff --git a/html/includes/graphs/atmvp/bits.inc.php b/html/includes/graphs/atmvp/bits.inc.php
index e69de29bb2..a7f8b6b230 100644
--- a/html/includes/graphs/atmvp/bits.inc.php
+++ 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("includes/graphs/generic_bits.inc.php");
+
+?>
diff --git a/html/pages/device/port/junose-atm-vp.inc.php b/html/pages/device/port/junose-atm-vp.inc.php
index cef6a555d7..eaebce14a7 100644
--- a/html/pages/device/port/junose-atm-vp.inc.php
+++ b/html/pages/device/port/junose-atm-vp.inc.php
@@ -15,7 +15,7 @@
     echo('</tr>');
 
     $graph_array['height'] = "100";
-    $graph_array['width']  = "215";
+    $graph_array['width']  = "214";
     $graph_array['to']     = $now;
     $graph_array['id']     = $vp['juniAtmVp_id'];
     $graph_array['type']   = $graph_type;
diff --git a/includes/polling/junose-atm-vp.inc.php b/includes/polling/junose-atm-vp.inc.php
index b64f116e8b..75bdd37b1f 100755
--- a/includes/polling/junose-atm-vp.inc.php
+++ b/includes/polling/junose-atm-vp.inc.php
@@ -1,7 +1,6 @@
 <?php
 
 $sql = "SELECT * FROM `ports` AS P, `juniAtmVp` AS J WHERE P.`device_id`  = '".$device['device_id']."' AND J.interface_id = P.interface_id";
-echo("$sql");
 $vp_data = mysql_query($sql);
 
 if(mysql_affected_rows()) {
diff --git a/poller.php b/poller.php
index ae35979d57..c178c3ffc2 100755
--- a/poller.php
+++ b/poller.php
@@ -195,6 +195,7 @@ while ($device = mysql_fetch_array($device_query))
     include("includes/polling/ports.inc.php");
     include("includes/polling/cisco-mac-accounting.inc.php");
     include("includes/polling/bgpPeer.inc.php");
+    include("includes/polling/junose-atm-vp.inc.php");
     include("includes/polling/toner.inc.php");
     include("includes/polling/ucd-diskio.inc.php");
     include("includes/polling/applications.inc.php");