diff --git a/oscar/SleepLib/loader_plugins/resmed_EDFinfo.h b/oscar/SleepLib/loader_plugins/resmed_EDFinfo.h
index 2cd8c45c..107f8adf 100644
--- a/oscar/SleepLib/loader_plugins/resmed_EDFinfo.h
+++ b/oscar/SleepLib/loader_plugins/resmed_EDFinfo.h
@@ -15,7 +15,7 @@
 #include "SleepLib/profiles.h"
 #include "SleepLib/loader_plugins/edfparser.h"
 
-enum EDFType { EDF_UNKNOWN, EDF_BRP, EDF_PLD, EDF_SAD, EDF_EVE, EDF_CSL };
+enum EDFType { EDF_UNKNOWN, EDF_BRP, EDF_PLD, EDF_SAD, EDF_EVE, EDF_CSL, EDF_AEV };
 
 EDFType lookupEDFType(const QString & filename);
 
diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
index 625262cc..9af644d0 100644
--- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp
@@ -331,8 +331,8 @@ int ResmedLoader::Open(const QString & dirpath)
     if ( ! parseIdentTGT(path, & info, idmap) )
         return -1;
  
-#ifdef DEBUG_IDENT
     qDebug() << "Info:" << info.series << info.model << info.modelnumber << info.serial;
+#ifdef DEBUG_IDENT
     qDebug() << "IdMap size:" << idmap.size();
     foreach ( QString st , idmap.keys() ) {
         qDebug() << "Key" << st << "Value" << idmap[st];
@@ -1559,22 +1559,23 @@ QHash<QString, QString> parseIdentLine( const QString line, MachineInfo * info)
         } else if (key == "PNA") {  // Product Name
             value.replace("_"," ");
 
-        //  if (value.contains(STR_ResMed_S9)) {
-        //      value.replace(STR_ResMed_S9, "");
-        //      info->series = STR_ResMed_S9;
-        //  } else if (value.contains(STR_ResMed_AirSense10)) {
             if (value.contains(STR_ResMed_AirSense10)) {
-                value.replace(STR_ResMed_AirSense10, "");
+        //      value.replace(STR_ResMed_AirSense10, "");
                 info->series = STR_ResMed_AirSense10;
             } else if (value.contains(STR_ResMed_AirCurve10)) {
-                value.replace(STR_ResMed_AirCurve10, "");
+        //      value.replace(STR_ResMed_AirCurve10, "");
                 info->series = STR_ResMed_AirCurve10;
-            } else {
-                value.replace(STR_ResMed_S9, "");
+            } else {    // it will be a Series 9, and might not contain (STR_ResMed_S9)) 
+                value.replace("("," ");     // might sometimes have a double space... 
+                value.replace(")","");
+                if ( ! value.startsWith(STR_ResMed_S9)) {
+                    value.replace(STR_ResMed_S9, "");
+                    value.insert(0, " ");               // There's proablely a better way than this
+                    value.insert(0, STR_ResMed_S9);     // two step way to put "S9 " at the start
+                }
                 info->series = STR_ResMed_S9;
+        //      value.replace(STR_ResMed_S9, "");
             }
-        //  value.replace("(","");
-        //  value.replace(")","");
         //  if (value.contains("Adapt", Qt::CaseInsensitive)) {
         //      if (!value.contains("VPAP")) {
         //          value.replace("Adapt", QObject::tr("VPAP Adapt"));
@@ -1603,6 +1604,8 @@ EDFType lookupEDFType(const QString & filename)
         return EDF_SAD;
     } else if (text == "CSL") {
         return EDF_CSL;
+    } else if (text == "AEV") {
+        return EDF_AEV;
     } else return EDF_UNKNOWN;
 }
 
@@ -2083,8 +2086,10 @@ void ResDayTask::run()
         if (ovr.filemap.size() == 0)
             continue;
         Session * sess = new Session(mach, ovr.start);
-        sess->set_first(quint64(ovr.start)*1000L);
-        sess->set_last(quint64(ovr.end)*1000L);
+//      Do not set the session times according to Mask on/off times
+//      The LoadXXX edf routines will update them with recording start and durations
+//      sess->set_first(quint64(ovr.start)*1000L);
+//      sess->set_last(quint64(ovr.end)*1000L);
         ovr.sess = sess;
 
         for (auto mit=ovr.filemap.begin(), mend=ovr.filemap.end(); mit != mend; ++mit) {
@@ -2107,6 +2112,7 @@ void ResDayTask::run()
                 break;
             case EDF_EVE:
             case EDF_CSL:
+            case EDF_AEV:   // this is in the 36039 - must figure out what to do with it
                 break;
             default:
                 qWarning() << "Unrecognized file type for" << filename;
@@ -2720,7 +2726,10 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path)
             a = sess->AddEventList(code, EVL_Waveform, es.gain, es.offset, 0, 0, rate);
             a->AddWaveform(edf.startdate, es.dataArray, recs, duration);
 //          a = ToTimeDelta(sess,edf,es, code,recs,duration,0,0);
+        } else if (es.label == "Va") {  // Signal used in 36039... What to do with it???
+            a = nullptr;                // We'll skip it for now
         } else if (es.label == "") { // What the hell resmed??
+        // these empty lables should be changed in resmed_EDFInfo to something unique
             if (emptycnt == 0) {
                 code = RMS9_E01;
 //                ToTimeDelta(sess, edf, es, code, recs, duration);