diff --git a/html/index.php b/html/index.php
index 7fa1d4a8d5..d0d7445e8b 100755
--- a/html/index.php
+++ b/html/index.php
@@ -140,6 +140,7 @@ echo('</a>. Copyright &copy; 2006-'. date("Y"). ' by Adam Armstrong. All rights
 
 if ($config['page_gen'])
 {
+    echo('<br />MySQL: Cell '.($db_stats['fetchcell']+0).'/'.($db_stats['fetchcell_sec']+0).'s Row '.($db_stats['fetchrow']+0).'/'.($db_stats['fetchrow_sec']+0).'s Rows '.($db_stats['fetchrows']+0).'/'.($db_stats['fetchrows_sec']+0).'s Column '.($db_stats['fetchcol']+0).'/'.($db_stats['fetchcol_sec']+0));
     echo('<br />Generated in ' . $gentime . ' seconds.');
 }
 
diff --git a/html/pages/bill/actions.inc.php b/html/pages/bill/actions.inc.php
index be80777e1c..0a5716434d 100644
--- a/html/pages/bill/actions.inc.php
+++ b/html/pages/bill/actions.inc.php
@@ -2,38 +2,38 @@
 
 if ($_POST['action'] == "delete_bill" && $_POST['confirm'] == "confirm")
 {
-  $port_query = mysql_query("SELECT * FROM `bill_ports` WHERE `bill_id` = '$bill_id'");
-  while ($port_data = mysql_fetch_assoc($port_query))
+  foreach (dbFetchRows("SELECT * FROM `bill_ports` WHERE `bill_id` = ?", array($bill_id)) as $port_data)
   {
-    mysql_query("DELETE FROM `port_in_measurements` WHERE `port_id` = '".mres($port_data['bill_id'])."'");
-    mysql_query("DELETE FROM `port_out_measurements` WHERE `port_id` = '".mres($port_data['bill_id'])."'");
+    dbDelete('port_in_measurements', '`port_id` = ?', array($port_data['bill_id']));
+    dbDelete('port_out_measurements', '`port_id` = ?', array($port_data['bill_id']));
   }
 
-  mysql_query("DELETE FROM `bill_ports` WHERE `bill_id` = '".mres($bill_id)."'");
-  mysql_query("DELETE FROM `bill_data` WHERE `bill_id` = '".mres($bill_id)."'");
-  mysql_query("DELETE FROM `bill_perms` WHERE `bill_id` = '".mres($bill_id)."'");
-  mysql_query("DELETE FROM `bills` WHERE `bill_id` = '".mres($bill_id)."'");
+  dbDelete('bill_ports', '`bill_id` = ?', array($bill_id));
+  dbDelete('bill_data', '`bill_id` = ?', array($bill_id));
+  dbDelete('bill_perms', '`bill_id` = ?', array($bill_id));
+  dbDelete('bills', '`bill_id` = ?', array($bill_id));
 
   echo("<div class=infobox>Bill Deleted. Redirecting to Bills list.</div>");
 
   echo("<meta http-equiv='Refresh' content=\"2; url='bills/'\">");
 }
 
-if ($_POST['action'] == "add_bill_port") { mysql_query("INSERT INTO `bill_ports` (`bill_id`, `port_id`) VALUES ('".mres($_POST['bill_id'])."','".mres($_POST['interface_id'])."')"); }
-if ($_POST['action'] == "delete_bill_port") { mysql_query("DELETE FROM `bill_ports` WHERE `bill_id` = '".mres($bill_id)."' AND `port_id` = '".mres($_POST['interface_id'])."'"); }
+if ($_POST['action'] == "add_bill_port") 
+{ 
+  dbInsert(array('bill_id' => $_POST['bill_id'], 'port_id' => $_POST['interface_id']), 'bill_ports');
+}
+if ($_POST['action'] == "delete_bill_port") 
+{ 
+  dbDelete('bill_ports', "`bill_id` =  ? AND `port_id` = ?", array($bill_id, $_POST['interface_id']));
+}
 if ($_POST['action'] == "update_bill")
 {
-  mysql_query("UPDATE `bills` SET `bill_name` = '".mres($_POST['bill_name'])."',
-                                `bill_day` = '".mres($_POST['bill_day'])."',
-                                `bill_gb` = '".mres($_POST['bill_gb'])."',
-                                `bill_cdr` = '".mres($_POST['bill_cdr'])."',
-                                `bill_type` = '".mres($_POST['bill_type'])."'
-                                WHERE `bill_id` = '".mres($bill_id)."'");
 
-  if (mysql_affected_rows())
+  if (dbUpdate(array('bill_name' => $_POST['bill_name'], 'bill_day' => $_POST['bill_day'], 'bill_gb' => $_POST['bill_gb'], 
+                 'bill_cdr' => $_POST['bill_cdr'], 'bill_type' => $_POST['bill_type']), 'bills', '`bill_id` = ?' array($bill_id)))
   {
     print_message("Bill Properties Updated");
   }
 }
 
-?>
\ No newline at end of file
+?>