diff --git a/core/avhrrsatellite.cpp b/core/avhrrsatellite.cpp
index 2b43061..d8898bf 100644
--- a/core/avhrrsatellite.cpp
+++ b/core/avhrrsatellite.cpp
@@ -1256,6 +1256,8 @@ void AVHRRSatellite::AddSegmentsToListFromUdp(QByteArray thefilepath)
     SegmentGAC *seggac;
     SegmentVIIRSM *segviirsm;
     SegmentVIIRSDNB *segviirsdnb;
+    SegmentOLCI *segolciefr;
+    SegmentOLCI *segolcierr;
 
 
     QList<Segment*> *slmetop = seglmetop->GetSegmentlistptr();
@@ -1268,7 +1270,7 @@ void AVHRRSatellite::AddSegmentsToListFromUdp(QByteArray thefilepath)
     QList<Segment*> *slolcierr = seglolcierr->GetSegmentlistptr();
 
     thefilepath.replace( opts.dirremote.toLatin1(), opts.localdirremote.toLatin1()); // "/media/sdc1/", "/home/hugo/Vol2T/");
-    // qDebug() << "AddSegmentsToListFromUdp : " + QString(thefilepath) + " count = " << opts.segmentdirectorylist.count();
+    //qDebug() << "AddSegmentsToListFromUdp : " + QString(thefilepath) + " count = " << opts.segmentdirectorylist.count();
 
 
     if (opts.segmentdirectorylist.count() > 0)
@@ -1287,62 +1289,128 @@ void AVHRRSatellite::AddSegmentsToListFromUdp(QByteArray thefilepath)
                     if ( fileinfo.fileName().mid( 0, 8) == "AVHR_xxx" && fileinfo.fileName().mid( 67, 4) == ".bz2")
                     {
 
-                        qDebug() << "fileinfo filename  = " << fileinfo.fileName();
+                        qDebug() << "from UDP segment Metop added filename  = " << fileinfo.fileName();
                         QFile file(thefilepath);
                         segmetop = new SegmentMetop(&file,satlist);
-                        segmetop->segmentshow = true;
-                        slmetop->append(segmetop);
-                        emit signalAddedSegmentlist();
+                        if(segmetop->segmentok)
+                        {
+                            segmetop->segmentshow = true;
+                            countmetop++;
+                            slmetop->append(segmetop);
+                            emit signalAddedSegmentlist();
+                        }
+                        else
+                            delete segmetop;
 
                     }
                     if (fileinfo.fileName().mid( 0, 6) == "avhrr_" && fileinfo.fileName().mid( 22, 6) == "noaa19")
                     {
-                        qDebug() << "fileinfo filename  = " << fileinfo.fileName();
+                        qDebug() << "from UDP segment Noaa19 added filename  = " << fileinfo.fileName();
                         QFile file(thefilepath);
                         segnoaa = new SegmentNoaa(&file,satlist);
-                        segnoaa->segmentshow = true;
-                        slnoaa->append(segnoaa);
-                        emit signalAddedSegmentlist();
+                        if(segnoaa->segmentok)
+                        {
+                            segnoaa->segmentshow = true;
+                            countnoaa++;
+                            slnoaa->append(segnoaa);
+                            emit signalAddedSegmentlist();
+                        }
+                        else
+                            delete segnoaa;
 
                     }
                     if (fileinfo.fileName().mid( 0, 8) == "AVHR_HRP" && fileinfo.fileName().mid( 67, 4) == ".bz2")
                     {
-                        qDebug() << "fileinfo filename  = " << fileinfo.fileName();
+                        qDebug() << "from UDP segment HRP added filename  = " << fileinfo.fileName();
                         QFile file(thefilepath);
                         seghrp = new SegmentHRP(&file,satlist);
-                        seghrp->segmentshow = true;
-                        slhrp->append(seghrp);
-                        emit signalAddedSegmentlist();
+                        if(seghrp->segmentok)
+                        {
+                            seghrp->segmentshow = true;
+                            counthrp++;
+                            slhrp->append(seghrp);
+                            emit signalAddedSegmentlist();
+                        }
+                        else
+                            delete seghrp;
 
                     }
                     if (fileinfo.fileName().mid( 0, 8) == "AVHR_GAC")
                     {
-                        qDebug() << "fileinfo filename  = " << fileinfo.fileName();
+                        qDebug() << "from UDP segment GAC added filename  = " << fileinfo.fileName();
                         QFile file(thefilepath);
                         seggac = new SegmentGAC(&file,satlist);
-                        seggac->segmentshow = true;
-                        slgac->append(seggac);
-                        emit signalAddedSegmentlist();
+                        if(seggac->segmentok)
+                        {
+                            seggac->segmentshow = true;
+                            countgac++;
+                            slgac->append(seggac);
+                            emit signalAddedSegmentlist();
+                        }
+                        else
+                            delete seggac;
 
                     }
                     if (fileinfo.fileName().mid( 0, 8) == "SVMC_npp")
                     {
-                        qDebug() << "fileinfo filename  = " << fileinfo.fileName();
+                        qDebug() << "from UDP segment NPP M added filename filename  = " << fileinfo.fileName();
                         QFile file(thefilepath);
                         segviirsm = new SegmentVIIRSM(&file,satlist);
-                        segviirsm->segmentshow = true;
-                        slviirsm->append(segviirsm);
-                        emit signalAddedSegmentlist();
+                        if(segviirsm->segmentok)
+                        {
+                            segviirsm->segmentshow = true;
+                            countviirsm++;
+                            slviirsm->append(segviirsm);
+                            emit signalAddedSegmentlist();
+                        }
+                        else
+                            delete segviirsm;
 
                     }
                     if (fileinfo.fileName().mid( 0, 10) == "SVDNBC_npp")
                     {
-                        qDebug() << "fileinfo filename  = " << fileinfo.fileName();
+                        qDebug() << "from UDP segment NPP DNB added filename filename  = " << fileinfo.fileName();
                         QFile file(thefilepath);
                         segviirsdnb = new SegmentVIIRSDNB(&file,satlist);
-                        segviirsdnb->segmentshow = true;
-                        slviirsdnb->append(segviirsdnb);
-                        emit signalAddedSegmentlist();
+                        if(segviirsdnb->segmentok)
+                        {
+                            segviirsdnb->segmentshow = true;
+                            countviirsdnb++;
+                            slviirsdnb->append(segviirsdnb);
+                            emit signalAddedSegmentlist();
+                        }
+                        else
+                            delete segviirsdnb;
+
+                    }
+                    if (fileinfo.fileName().mid( 0, 12) == "S3A_OL_1_EFR")
+                    {
+                        qDebug() << "from UDP segment S3A EFR added filename filename  = " << fileinfo.fileName();
+                        segolciefr = new SegmentOLCI(SEG_OLCIEFR, fileinfo, satlist);
+                        if(segolciefr->segmentok == true)
+                        {
+                            segolciefr->segmentshow = true;
+                            countolciefr++;
+                            slolciefr->append(segolciefr);
+                            emit signalAddedSegmentlist();
+                        }
+                        else
+                            delete segolciefr;
+
+                    }
+                    if (fileinfo.fileName().mid( 0, 12) == "S3A_OL_1_ERR")
+                    {
+                        qDebug() << "from UDP segment S3A ERR added filename filename  = " << fileinfo.fileName();
+                        segolcierr = new SegmentOLCI(SEG_OLCIERR, fileinfo, satlist);
+                        if(segolcierr->segmentok == true)
+                        {
+                            segolcierr->segmentshow = true;
+                            countolcierr++;
+                            slolcierr->append(segolcierr);
+                            emit signalAddedSegmentlist();
+                        }
+                        else
+                            delete segolcierr;
 
                     }
                     if (fileinfo.fileName().mid( 0, 9) == "H-000-MSG" && fileinfo.fileName().mid( 13, 3) == "MSG")
diff --git a/core/dialogpreferences.ui b/core/dialogpreferences.ui
index 7777ab2..40120f3 100644
--- a/core/dialogpreferences.ui
+++ b/core/dialogpreferences.ui
@@ -158,7 +158,7 @@
      <item>
       <widget class="QStackedWidget" name="stackedWidget">
        <property name="currentIndex">
-        <number>7</number>
+        <number>5</number>
        </property>
        <widget class="QWidget" name="page2D">
         <property name="layoutDirection">
@@ -1344,7 +1344,7 @@
           </rect>
          </property>
          <property name="text">
-          <string>Enable UDP messages from EumetcastWatcher</string>
+          <string>Enable UDP messages from EumetcastWatcher (the TLE's must be in place)</string>
          </property>
         </widget>
        </widget>
diff --git a/core/formephem.cpp b/core/formephem.cpp
index b8eb7e3..0addca5 100644
--- a/core/formephem.cpp
+++ b/core/formephem.cpp
@@ -965,12 +965,15 @@ void FormEphem:: showprogress(QString str)
 
 void FormEphem::processPendingDatagrams()
 {
+    Satellite sat;
+    bool weatherok = sats->GetSatellite(29499, &sat);
+    bool resourceok = sats->GetSatellite(41335, &sat);
     while (udpSocket->hasPendingDatagrams())
     {
         QByteArray datagram;
         datagram.resize(udpSocket->pendingDatagramSize());
         udpSocket->readDatagram(datagram.data(), datagram.size());
-        if (opts.udpmessages)
+        if (opts.udpmessages && weatherok && resourceok)
            emit signalDatagram(datagram.data());
     }
 }
diff --git a/core/formtoolbox.ui b/core/formtoolbox.ui
index a1df8e7..35d7aa5 100644
--- a/core/formtoolbox.ui
+++ b/core/formtoolbox.ui
@@ -32,7 +32,7 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>3</number>
+      <number>0</number>
      </property>
      <property name="tabBarAutoHide">
       <bool>false</bool>
diff --git a/core/mainwindow.cpp b/core/mainwindow.cpp
index 01f2bae..f9cf568 100644
--- a/core/mainwindow.cpp
+++ b/core/mainwindow.cpp
@@ -147,6 +147,7 @@ MainWindow::MainWindow(QWidget *parent) :
     connect( ui->stackedWidget, SIGNAL(currentChanged(int)),formglobecyl, SLOT(updatesatmap(int)) );
     connect( formephem,SIGNAL(signalDirectoriesRead()), formgeostationary, SLOT(PopulateTree()) );
     connect( seglist,SIGNAL(signalAddedSegmentlist()), formephem, SLOT(showSegmentsAdded()));
+    connect( seglist,SIGNAL(signalAddedSegmentlist()), formglobecyl, SLOT(slotShowSegmentCount()));
 
     connect( formephem,SIGNAL(signalDirectoriesRead()), formglobecyl, SLOT(setScrollBarMaximum()));
     connect( formglobecyl, SIGNAL(signalMakeImage()), formimage, SLOT(slotMakeImage()));