diff --git a/Graphs/gBarChart.h b/Graphs/gBarChart.h
index 6931cfc3..10960f00 100644
--- a/Graphs/gBarChart.h
+++ b/Graphs/gBarChart.h
@@ -23,7 +23,7 @@ class gBarChart:public Layer
 
         // d.Set(i+2400000.5+.000001); // JDN vs MJD vs Rounding errors
 
-        virtual const QString & FormatX(double v) { static QString t; QDateTime d; d=d.fromMSecsSinceEpoch(v*86400000.0); t=d.toString("MMM dd"); return t; }
+        virtual const QString & FormatX(double v) { static QString t; QDateTime d; d=d.fromTime_t(v*86400.0); t=d.toString("MMM dd"); return t; }
         //virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(vi*86400000.0); t=d.Format(wxT("HH:mm")); return t; };
         //virtual const wxString & FormatX(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; };
         virtual const QString & FormatY(double v) { static QString t; t.sprintf("%.1f",v); return t; }
diff --git a/Graphs/gFlagsLine.cpp b/Graphs/gFlagsLine.cpp
index 99e7c857..f2760776 100644
--- a/Graphs/gFlagsLine.cpp
+++ b/Graphs/gFlagsLine.cpp
@@ -129,10 +129,8 @@ void gFlagsLine::paint(gGraph & w,int left, int top, int width, int height)
 
 
     // Draw text label
-    //int x,y;
-    //GetTextExtent(m_label,x,y);
-    //w.DrawStaticText(m_static,left-m_lx-10,top+(height/2)-(m_ly/2));
     w.renderText(m_label,left-m_lx-10,top+(height/2)+(m_ly/2));
+
     float x1,x2;
 
     float bartop=top+2;
diff --git a/Graphs/gFlagsLine.h b/Graphs/gFlagsLine.h
index d32a8880..3a4deeea 100644
--- a/Graphs/gFlagsLine.h
+++ b/Graphs/gFlagsLine.h
@@ -7,7 +7,6 @@
 #ifndef GFLAGSLINE_H
 #define GFLAGSLINE_H
 
-#include <QStaticText>
 #include "gGraphView.h"
 
 class gFlagsGroup;
@@ -34,8 +33,6 @@ class gFlagsLine:public Layer
         QColor m_flag_color;
         GLBuffer *quads, *lines;
         int m_lx, m_ly;
-        //QStaticText m_static;
-
 };
 
 class gFlagsGroup:public LayerGroup
diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp
index c2e62f08..b9b702be 100644
--- a/Graphs/gGraphView.cpp
+++ b/Graphs/gGraphView.cpp
@@ -2,7 +2,8 @@
 #include <QFontMetrics>
 #include "gGraphView.h"
 #include "SleepLib/profiles.h"
-
+//#include <QtConcurrentRun>
+#include <QElapsedTimer>
 bool _graph_init=false;
 
 QFont * defaultfont=NULL;
@@ -572,6 +573,8 @@ void gGraph::paint(int originX, int originY, int width, int height)
         quad->add(originX+m_selection.x()+m_selection.width(),originY+height-top-bottom, originX+m_selection.x(),originY+height-top-bottom);
     }
 
+    //sleep(1);
+
     //m_graphview->gl_mutex.lock();
     /*QGLFormat fmt=m_graphview->format();
     QGLContext ctx(fmt);
@@ -977,10 +980,6 @@ void gGraph::SetMaxY(EventDataType v)
 {
     max_y=v;
 }
-void gGraph::DrawStaticText(QStaticText & text, short x, short y)
-{
-    m_graphview->DrawStaticText(text,x,y);
-}
 GLBuffer * gGraph::lines()
 {
     return m_graphview->lines;
@@ -1110,13 +1109,6 @@ void gGraphView::AddTextQue(QString & text, short x, short y, float angle, QColo
     q.color=color;
     q.font=font;
 }
-void gGraphView::DrawStaticText(QStaticText & text, short x, short y)
-{
-    // don't use this for multithread
-    QPainter painter(this);
-    painter.drawStaticText(x,y,text);
-    painter.end();
-}
 
 void gGraphView::AddGraph(gGraph *g,short group)
 {
@@ -1264,7 +1256,7 @@ void gGraphView::paintGL()
     if (width()<=0) return;
     if (height()<=0) return;
 
-    QTime time;
+    QElapsedTimer time;
     time.start();
 
     glClearColor(255,255,255,255);
@@ -1298,6 +1290,7 @@ void gGraphView::paintGL()
         threaded=true;
     } else threaded=false;
 
+   // threaded=true;
     for (int i=0;i<m_graphs.size();i++) {
         if (m_graphs[i]->isEmpty() || !m_graphs[i]->visible()) continue;
         numgraphs++;
@@ -1311,9 +1304,9 @@ void gGraphView::paintGL()
         if ((py + h + graphSpacer) >= 0) {
             w=width();
 
-
             if (threaded) {
                 masterlock->acquire(1); // book an available CPU
+                //QFuture<void> future = QtConcurrent::run(m_graphs[i],&gGraph::paint,px,py,width()-titleWidth,h);
                 m_graphs[i]->threadStart(); // this only happens once.. It stays dormant when not in use.
                 m_graphs[i]->thread()->paint(px,py,width()-titleWidth,h);
                 m_graphs[i]->thread()->setPriority(QThread::HighPriority);
diff --git a/Graphs/gGraphView.h b/Graphs/gGraphView.h
index a3d9b92f..dd038143 100644
--- a/Graphs/gGraphView.h
+++ b/Graphs/gGraphView.h
@@ -241,7 +241,6 @@ public:
     short group() { return m_group; }
     void setGroup(short group) { m_group=group; }
     void DrawTextQue();
-    void DrawStaticText(QStaticText & text, short x, short y);
     void setDay(Day * day);
     gThread * thread() { return m_thread; }
     virtual void paint(int originX, int originY, int width, int height);
@@ -315,7 +314,6 @@ public:
     gGraph *m_selected_graph;
 
     void AddTextQue(QString & text, short x, short y, float angle, QColor & color, QFont * font);
-    void DrawStaticText(QStaticText & text, short x, short y);
     int horizTravel() { return m_horiz_travel; }
     void DrawTextQue();
 
diff --git a/Graphs/gSessionTime.h b/Graphs/gSessionTime.h
index cf352218..e47cc8c6 100644
--- a/Graphs/gSessionTime.h
+++ b/Graphs/gSessionTime.h
@@ -31,7 +31,7 @@ class gSessionTime:public Layer
     protected:
         Qt::Orientation m_orientation;
 
-        virtual const QString & FormatX(double v) { static QString t; QDateTime d; d=d.fromMSecsSinceEpoch(v*86400000.0); t=d.toString("MMM dd"); return t; }
+        virtual const QString & FormatX(double v) { static QString t; QDateTime d; d=d.fromTime_t(v*86400.0); t=d.toString("MMM dd"); return t; }
         //virtual const wxString & FormatX(double v) { static wxString t; wxDateTime d; d.Set(vi*86400000.0); t=d.Format(wxT("HH:mm")); return t; };
         //virtual const wxString & FormatX(double v) { static wxString t; t=wxString::Format(wxT("%.1f"),v); return t; };
         virtual const QString & FormatY(double v) { static QString t; t.sprintf("%.1f",v); return t; }
diff --git a/Graphs/gStatsLine.cpp b/Graphs/gStatsLine.cpp
index ffcc8056..7cd03bef 100644
--- a/Graphs/gStatsLine.cpp
+++ b/Graphs/gStatsLine.cpp
@@ -11,29 +11,27 @@ void gStatsLine::paint(gGraph & w, int left, int top, int width, int height)
     if (!m_visible) return;
     //if (m_empty) return;
     height=height;
-    //int x,y;
-    m_text=m_label;
-//    GetTextExtent(m_text,x,y);
+
     int z=(width+gYAxis::Margin)/5;
     int p=left-gYAxis::Margin;
 
 
     top+=4;
-    w.DrawStaticText(st_label,p,top);
+    w.renderText(m_label,p,top);
 
     //w.renderText(m_text,p,top,0,m_textcolor);
 
     p+=z;
-    w.DrawStaticText(st_min,p,top);
+    w.renderText(st_min,p,top);
 
     p+=z;
-    w.DrawStaticText(st_avg,p,top);
+    w.renderText(st_avg,p,top);
 
     p+=z;
-    w.DrawStaticText(st_p90,p,top);
+    w.renderText(st_p90,p,top);
 
     p+=z;
-    w.DrawStaticText(st_max,p,top);
+    w.renderText(st_max,p,top);
 
 }
 
@@ -47,23 +45,9 @@ void gStatsLine::SetDay(Day *d)
     m_avg=d->wavg(m_code);
     m_p90=d->p90(m_code);
 
-    st_label.setText(m_label);
-    st_min.setText("Min="+QString::number(m_min,'f',2));
-    st_max.setText("Max="+QString::number(m_max,'f',2));
-    st_avg.setText("Avg="+QString::number(m_avg,'f',2));
-    st_p90.setText("90%="+QString::number(m_p90,'f',2));
-
- //   m_stext.setText(m_text);
-    //  m_empty=true;
-/*    for (int i=0;i<m_codes.size();i++) {
-        if (m_day->count(m_codes[i])>0) {
-            m_empty=false;
-            break;
-        }
-    } */
+    st_min="Min="+QString::number(m_min,'f',2);
+    st_max="Max="+QString::number(m_max,'f',2);
+    st_avg="Avg="+QString::number(m_avg,'f',2);
+    st_p90="90%="+QString::number(m_p90,'f',2);
 
 }
-//bool gStatsLine::isEmpty()
-//{
-//    return m_empty;
-//}
diff --git a/Graphs/gStatsLine.h b/Graphs/gStatsLine.h
index e5e5d4f7..152703c3 100644
--- a/Graphs/gStatsLine.h
+++ b/Graphs/gStatsLine.h
@@ -2,7 +2,6 @@
 #define GSTATSLINE_H
 
 #include "SleepLib/machine.h"
-#include <QStaticText>
 #include "gGraphView.h"
 
 class gStatsLine : public Layer
@@ -11,15 +10,12 @@ public:
     gStatsLine(ChannelID code,QString label="",QColor textcolor=Qt::black);
     virtual void paint(gGraph & w, int left, int top, int width, int height);
     void SetDay(Day *d);
-    //bool isEmpty();
 
 protected:
     QString m_label;
     QColor m_textcolor;
-    //bool m_empty;
     EventDataType m_min,m_max,m_avg,m_p90;
-    QString m_text;
-    QStaticText st_label,st_min,st_max,st_avg,st_p90;
+    QString st_min,st_max,st_avg,st_p90;
     float m_tx,m_ty;
 };
 
diff --git a/SleepLib/loader_plugins/cms50_loader.cpp b/SleepLib/loader_plugins/cms50_loader.cpp
index 2223f577..381e5a36 100644
--- a/SleepLib/loader_plugins/cms50_loader.cpp
+++ b/SleepLib/loader_plugins/cms50_loader.cpp
@@ -194,15 +194,15 @@ bool CMS50Loader::OpenSPORFile(QString path,Machine *mach,Profile *profile)
             qDebug() << "Invalid date time retreieved in CMS50::OpenSPO[R2]File";
             return false;
         }
-        starttime=date.toMSecsSinceEpoch();
+        starttime=qint64(date.toTime_t())*1000L;
     } else if (dt.isValid()) { // Else take the filenames date
         date=dt;
-        starttime=dt.toMSecsSinceEpoch();
+        starttime=qint64(dt.toTime_t())*1000L;
     } else {  // Has nothing, so add it up to current time
         qDebug() << "CMS50: Couldn't get any start date indication";
         date=QDateTime::currentDateTime();
         date=date.addSecs(-seconds);
-        starttime=date.toMSecsSinceEpoch();
+        starttime=qint64(date.toTime_t())*1000L;
     }
 
     f.seek(data_starts);
diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp
index f77df02f..d99b4af8 100644
--- a/SleepLib/loader_plugins/prs1_loader.cpp
+++ b/SleepLib/loader_plugins/prs1_loader.cpp
@@ -566,8 +566,6 @@ bool PRS1Loader::Parse002(Session *session,unsigned char *buffer,int size,qint64
             pos+=2;
             t+=qint64(delta)*1000L;
             tt=t;;
-            //QDateTime d=QDateTime::fromMSecsSinceEpoch(t);
-            //qDebug()<< d.toString("yyyy-MM-dd HH:mm:ss") << ": " << hex << pos+15 << " " << hex << int(code) << int(delta);
         }
 
         cnt++;
@@ -787,8 +785,6 @@ bool PRS1Loader::Parse002ASV(Session *session,unsigned char *buffer,int size,qin
             qDebug() << "Illegal PRS1 code " << hex << int(code) << " appeared at " << hex << pos+16;
             return false;
         }
-        //QDateTime d=QDateTime::fromMSecsSinceEpoch(t);
-        //qDebug()<< d.toString("yyyy-MM-dd HH:mm:ss") << ": " << hex << pos+15 << " " << hex << int(code) ;
         if (code==0) {
         } else
         if (code!=0x12) {
diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp
index d10b8783..cc5de69e 100644
--- a/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/SleepLib/loader_plugins/resmed_loader.cpp
@@ -91,7 +91,7 @@ bool EDFParser::Parse()
         qDebug() << "Invalid date time retreieved parsing EDF File " << filename;
         return false;
     }
-    startdate=startDate.toMSecsSinceEpoch();
+    startdate=qint64(startDate.toTime_t())*1000L;
 
     //qDebug() << startDate.toString("yyyy-MM-dd HH:mm:ss");
 
diff --git a/SleepLib/machine.cpp b/SleepLib/machine.cpp
index 98d4619c..a8f8dc26 100644
--- a/SleepLib/machine.cpp
+++ b/SleepLib/machine.cpp
@@ -374,7 +374,7 @@ Day *Machine::AddSession(Session *s,Profile *p)
 
     sessionlist[s->session()]=s; // To make sure it get's saved later even if it's not wanted.
 
-    QDateTime d1,d2=QDateTime::fromMSecsSinceEpoch(s->first());
+    QDateTime d1,d2=QDateTime::fromTime_t(s->first()/1000);
 
     QDate date=d2.date();
     QTime time=d2.time();
@@ -390,7 +390,7 @@ Day *Machine::AddSession(Session *s,Profile *p)
     } else if (combine_sessions > 0) {
         dit=day.find(date.addDays(-1)); // Check Day Before
         if (dit!=day.end()) {
-            QDateTime lt=QDateTime::fromMSecsSinceEpoch(dit.value()->last());
+            QDateTime lt=QDateTime::fromTime_t(dit.value()->last()/1000);
             closest_session=lt.secsTo(d2)/60;
             if (closest_session<combine_sessions) {
                 date=date.addDays(-1);
@@ -398,7 +398,7 @@ Day *Machine::AddSession(Session *s,Profile *p)
         } else {
             nextday=day.find(date.addDays(1));// Check Day Afterwards
             if (nextday!=day.end()) {
-                QDateTime lt=QDateTime::fromMSecsSinceEpoch(nextday.value()->first());
+                QDateTime lt=QDateTime::fromTime_t(nextday.value()->first()/1000);
                 closest_session=d2.secsTo(lt)/60;
                 if (closest_session < combine_sessions) {
                     // add todays here. pull all tomorrows records to this date.
@@ -430,8 +430,6 @@ Day *Machine::AddSession(Session *s,Profile *p)
         dd=new Day(this);
         day[date]=dd;
         // Add this Day record to profile
-        //QDateTime d=QDateTime::fromMSecsSinceEpoch(date);
-        //qDebug() << "New day: " << d.toString("yyyy-MM-dd HH:mm:ss");
         p->AddDay(date,dd,m_type);
     } else {
         dd=*dit;
diff --git a/daily.cpp b/daily.cpp
index 788022bc..a9077047 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -649,7 +649,7 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day)
                         t-=float(m.value()[z]->raw(o)/2.0)*1000.0;
                     }
                     QStringList a;
-                    QDateTime d=QDateTime::fromMSecsSinceEpoch(t);
+                    QDateTime d=QDateTime::fromTime_t(t/1000);
                     QString s=QString("#%1: %2 (%3)").arg((int)++mccnt[code],(int)3,(int)10,QChar('0')).arg(d.toString("HH:mm:ss")).arg(m.value()[z]->raw(o));
                     a.append(s);
                     a.append(d.toString("yyyy-MM-dd HH:mm:ss"));
@@ -814,8 +814,8 @@ void Daily::Load(QDate date)
 
         html+="<tr><td align='center'><b>Date</b></td><td align='center'><b>"+tr("Sleep")+"</b></td><td align='center'><b>"+tr("Wake")+"</b></td><td align='center'><b>"+tr("Hours")+"</b></td></tr>";
         int tt=cpap->total_time()/1000.0;
-        QDateTime date=QDateTime::fromMSecsSinceEpoch(cpap->first());
-        QDateTime date2=QDateTime::fromMSecsSinceEpoch(cpap->last());
+        QDateTime date=QDateTime::fromTime_t(cpap->first()/1000);
+        QDateTime date2=QDateTime::fromTime_t(cpap->last()/1000);
 
         int h=tt/3600.0;
         int m=(tt/60)%60;
@@ -953,8 +953,8 @@ void Daily::Load(QDate date)
         QDateTime fd,ld;
         bool corrupted_waveform=false;
         for (QVector<Session *>::iterator s=cpap->begin();s!=cpap->end();s++) {
-            fd=QDateTime::fromMSecsSinceEpoch((*s)->first());
-            ld=QDateTime::fromMSecsSinceEpoch((*s)->last());
+            fd=QDateTime::fromTime_t((*s)->first()/1000);
+            ld=QDateTime::fromTime_t((*s)->last()/1000);
             QHash<ChannelID,QVariant>::iterator i=(*s)->settings.find(CPAP_BrokenWaveform);
             if ((i!=(*s)->settings.end()) && i.value().toBool()) corrupted_waveform=true;
             tmp.sprintf(("<tr><td align=center>%08i</td><td align=center>"+fd.date().toString(Qt::SystemLocaleShortDate)+"</td><td align=center>"+fd.toString("HH:mm ")+"</td><td align=center>"+ld.toString("HH:mm")+"</td></tr>").toLatin1(),(*s)->session());
@@ -1090,9 +1090,9 @@ Session * Daily::CreateJournalSession(QDate date)
     QDateTime dt;
     dt.setDate(date);
     dt.setTime(QTime(17,0)); //5pm to make sure it goes in the right day
-    sess->set_first(dt.toMSecsSinceEpoch());
+    sess->set_first(qint64(dt.toTime_t())*1000L);
     dt=dt.addSecs(3600);
-    sess->set_last(dt.toMSecsSinceEpoch());
+    sess->set_last(qint64(dt.toTime_t())*1000L);
     sess->SetChanged(true);
     m->AddSession(sess,profile);
     return sess;
@@ -1157,8 +1157,8 @@ void Daily::on_treeWidget_itemSelectionChanged()
     QDateTime d;
     if (!item->text(1).isEmpty()) {
         d=d.fromString(item->text(1),"yyyy-MM-dd HH:mm:ss");
-        double st=(d.addSecs(-120)).toMSecsSinceEpoch();
-        double et=(d.addSecs(120)).toMSecsSinceEpoch();
+        double st=qint64((d.addSecs(-120)).toTime_t())*1000L;
+        double et=qint64((d.addSecs(120)).toTime_t())*1000L;
         GraphView->SetXBounds(st,et);
     }
 }