diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index aec8f925..be659679 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -16,11 +16,10 @@
 #include <QPrintDialog>
 #include <QPainter>
 #include <QMainWindow>
-#include <QProgressDialog>
-#include <QElapsedTimer>
 
 #include "mainwindow.h"
 #include "statistics.h"
+#include "CProgressBar.h"
 
 extern MainWindow *mainwin;
 
@@ -160,18 +159,10 @@ bool rxAHILessThan(const RXItem * rx1, const RXItem * rx2)
 
 void Statistics::updateRXChanges()
 {
-    // We may want a progress bar.  Start time to see how long it is taking.
-    QProgressDialog * progress = nullptr;
-    int lastPctDone = 0;
-    bool showProgress = false;
-    QElapsedTimer timer;
-    timer.start();
-    int numDays = p_profile->daylist.count();
-    int daysProcessed = 0;
-    int timerLimit = 2000;  // If it takes 2 seconds for less than half the work, we will start a progress bar
-    bool timeChecked = false;
-    qDebug() << "UpdateRXChanges called for" << numDays << "days";
+    // Set conditional progress bar.
+    CProgressBar * progress = new CProgressBar (QObject::tr("Updating Statistics cache"), mainwin, p_profile->daylist.count());
 
+    // Clear loaded rx cache
     rxitems.clear();
 
     // Read the cache from disk
@@ -192,6 +183,8 @@ void Statistics::updateRXChanges()
         const QDate & date = it.key();
         Day * day = it.value();
 
+        progress->add (1);          // Increment progress bar
+
         Machine * mach = day->machine(MT_CPAP);
         if (mach == nullptr)
             continue;
@@ -493,44 +486,10 @@ void Statistics::updateRXChanges()
             // And insert into rx record into the rx cache
             rxitems.insert(date, rx);
         }
-
-        daysProcessed++;
-
-        // See if it is time to show a progress bar: we don't have a progress bar, we haven't checked the timer yet
-        if (!progress && !timeChecked && (timer.elapsed() > timerLimit)) {
-            timeChecked = true;  // Flag to prevent future calls to timer
-            {
-                qDebug() << "updateRXChanges starting progress bar with" << daysProcessed << "days processed of" << numDays << "total";
-                progress = new QProgressDialog(QObject::tr("Updating Statistics cache"),
-                                        QString(), 0, numDays, 0,
-                                        Qt::WindowSystemMenuHint | Qt::WindowTitleHint);
-                progress->setValue(0);
-                progress->setMinimumWidth(250);
-                progress->show();
-                numDays -= daysProcessed;       // numDays now is number of days to go
-                daysProcessed = 1;              // None processed yet for remaining days
-                QCoreApplication::processEvents();
-                showProgress = true;
-            }
-        }
-
-        // Update progress bar if one is displayed
-        if (showProgress) {
-            int pctDone = (100 * daysProcessed) / numDays;
-            if (pctDone != lastPctDone) {
-                lastPctDone = pctDone;
-                progress->setValue(daysProcessed);
-                QCoreApplication::processEvents();
-            }
-        }
-
     }
     // Store RX cache to disk
     saveRXChanges();
 
-    if (showProgress)      // Force progress bar to stop (if we have a progress bar)
-        progress->setValue(numDays);
-
     // Now do the setup for the best worst highlighting
     QList<RXItem *> list;
     ri_end = rxitems.end();
@@ -556,8 +515,8 @@ void Statistics::updateRXChanges()
         list[0]->highlight = 1; // best
     }
 
-    // update record box info..
-
+    // Close the progress bar
+    progress->close();
 }