diff --git a/billing-calculate.php b/billing-calculate.php
index 853ab71d7..a052aa93f 100755
--- a/billing-calculate.php
+++ b/billing-calculate.php
@@ -89,6 +89,9 @@ include("includes/functions.php");
                          'rate_95th_in' => $rate_data['rate_95th_in'],
                          'rate_95th_out' => $rate_data['rate_95th_out'],
                          'dir_95th' => $rate_data['dir_95th'],
+                         'rate_average' => $rate_data['rate_average'],
+                         'rate_average_in' => $rate_data['rate_average_in'],
+                         'rate_average_out' => $rate_data['rate_average_out'],
                          'traf_total' => $rate_data['total_data'],
                          'traf_in' => $rate_data['total_data_in'],
                          'traf_out' => $rate_data['total_data_out'],
@@ -104,7 +107,8 @@ include("includes/functions.php");
          dbInsert($update, 'bill_history');
          echo(" * Generated historical data from ".strftime("%x @ %X", strtotime($datefrom_lp))." to ".strftime("%x @ %X", strtotime($dateto_lp))."\n");
       }
-
+*/
+print_r($rate_data);
   }
 
 ?>
diff --git a/database-schema.sql b/database-schema.sql
index 6bd50d49b..e6f3e1afb 100644
--- a/database-schema.sql
+++ b/database-schema.sql
@@ -1185,6 +1185,9 @@ CREATE TABLE IF NOT EXISTS `bill_history` (
   `rate_95th_out` int(11) NOT NULL,
   `rate_95th` int(11) NOT NULL,
   `dir_95th` varchar(3) NOT NULL,
+  `rate_average` int(11) NOT NULL,
+  `rate_average_in` int(11) NOT NULL,
+  `rate_average_out` int(11) NOT NULL,
   `traf_in` int(11) NOT NULL,
   `traf_out` int(11) NOT NULL,
   `traf_total` int(11) NOT NULL,
diff --git a/database-update.sql b/database-update.sql
index 87d6c7202..12352645d 100644
--- a/database-update.sql
+++ b/database-update.sql
@@ -20,5 +20,5 @@ ALTER TABLE `bills` ADD `rate_average_out` int(11) NOT NULL;
 ALTER TABLE `bills` ADD `rate_average` int(11) NOT NULL;
 ALTER TABLE `bills` ADD `bill_last_calc` datetime NOT NULL;
 
-CREATE TABLE IF NOT EXISTS `bill_history` (  `id` int(11) NOT NULL AUTO_INCREMENT,  `bill_id` int(11) NOT NULL,  `bill_datefrom` datetime NOT NULL,  `bill_dateto` datetime NOT NULL,  `bill_type` text NOT NULL,  `bill_allowed` int(11) NOT NULL,  `bill_used` int(11) NOT NULL,  `bill_overuse` int(11) NOT NULL,  `bill_percent` decimal(5,2) NOT NULL,  `rate_95th_in` int(11) NOT NULL,  `rate_95th_out` int(11) NOT NULL,  `rate_95th` int(11) NOT NULL,  `dir_95th` varchar(3) NOT NULL,  `traf_in` int(11) NOT NULL,  `traf_out` int(11) NOT NULL,  `traf_total` int(11) NOT NULL,  PRIMARY KEY (`id`),  KEY `bill_id` (`bill_id`)) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+CREATE TABLE IF NOT EXISTS `bill_history` (  `id` int(11) NOT NULL AUTO_INCREMENT,  `bill_id` int(11) NOT NULL,  `bill_datefrom` datetime NOT NULL,  `bill_dateto` datetime NOT NULL,  `bill_type` text NOT NULL,  `bill_allowed` int(11) NOT NULL,  `bill_used` int(11) NOT NULL,  `bill_overuse` int(11) NOT NULL,  `bill_percent` decimal(5,2) NOT NULL,  `rate_95th_in` int(11) NOT NULL,  `rate_95th_out` int(11) NOT NULL,  `rate_95th` int(11) NOT NULL,  `dir_95th` varchar(3) NOT NULL, `rate_average` int(11) NOT NULL, `rate_average_in` int(11) NOT NULL, `rate_average_out` int(11) NOT NULL,  `traf_in` int(11) NOT NULL,  `traf_out` int(11) NOT NULL,  `traf_total` int(11) NOT NULL,  PRIMARY KEY (`id`),  KEY `bill_id` (`bill_id`)) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;