diff --git a/flow-monitor.py b/flow-monitor.py
index 603c285..6aa284b 100644
--- a/flow-monitor.py
+++ b/flow-monitor.py
@@ -98,6 +98,8 @@ class start(threading.Thread, deviceBase):
         total_time_store_delta = 600  # seconds
         flow_time_store_delta = 600  # seconds
 
+        startup_wait_seconds = 30
+
         raw_min = 3.89
         raw_max = 19.54
 
@@ -111,7 +113,7 @@ class start(threading.Thread, deviceBase):
         bbltotal_ch = Channel('bbl_total', galtotal_ch.senddelta_value/gal_per_bbl, total_time_store_delta)
 
         gpmflow_ch = Channel('gpm_flow', 10.0, flow_time_store_delta)
-        bpdflow_ch = Channel('bpd_flow', gpmflow_ch.senddelta_value/gal_per_bbl, total_time_store_delta)
+        bpdflow_ch = Channel('bpd_flow', 5.0, flow_time_store_delta)
 
         runstatus_ch = Channel('run_status', 0.5, 600)
 
@@ -142,8 +144,8 @@ class start(threading.Thread, deviceBase):
             last_measured_timestamp = time.time()
 
         wait_loops = 0
-        while wait_loops < 30:
-            print("Waiting to start driver in {} seconds".format(30 - wait_loops))
+        while wait_loops < startup_wait_seconds:
+            print("Waiting to start driver in {} seconds".format(startup_wait_seconds - wait_loops))
             wait_loops += 1
             time.sleep(1)