diff --git a/core/avhrrsatellite.cpp b/core/avhrrsatellite.cpp
index d396522..1db58ef 100644
--- a/core/avhrrsatellite.cpp
+++ b/core/avhrrsatellite.cpp
@@ -153,6 +153,8 @@ void AVHRRSatellite::AddSegmentsToList(QFileInfoList fileinfolist)
     for (int i = 0; i < fileinfolist.size(); ++i)
     {
         fileInfo = fileinfolist.at(i);
+        qDebug() << "---->" << fileInfo.baseName();
+
         counter++;
 
         if (fileInfo.fileName().mid( 0, 8) == "AVHR_xxx" && fileInfo.fileName().mid( 67, 4) == ".bz2" && fileInfo.isFile())   // EPS-10
@@ -496,7 +498,7 @@ void AVHRRSatellite::getFilenameParameters(int geosatindex, QString filename,  Q
                     filenbr = filename.mid(opts.geosatellites.at(geosatindex).indexfilenbr, opts.geosatellites.at(geosatindex).lengthfilenbr).toInt();
                     strdate = filename.mid(opts.geosatellites.at(geosatindex).indexdate, opts.geosatellites.at(geosatindex).lengthdate);
 
-                    if( opts.geosatellites.at(geosatindex).shortname == "GOES_16" ) //convert YYYYDDDHHmm to YYYYMMDDHHmm
+                    if( opts.geosatellites.at(geosatindex).shortname == "GOES_16" || opts.geosatellites.at(geosatindex).shortname == "GOES_17" ) //convert YYYYDDDHHmm to YYYYMMDDHHmm
                     {
                         QDate fdate = QDate(strdate.mid(0, 4).toInt(), 1, 1).addDays(strdate.mid(4, 3).toInt() - 1);
                         strdate = fdate.toString("yyyyMMdd") + strdate.mid(7, 4);
@@ -781,8 +783,8 @@ void AVHRRSatellite::ReadDirectories(QDate seldate, int hoursbefore)
 
 
                     fileinfolist = map.values();
-                    for(int i = 0; i < fileinfolist.count(); i++)
-                        qDebug() << "map values = " << fileinfolist.at(i).absoluteFilePath();
+//                    for(int i = 0; i < fileinfolist.count(); i++)
+//                        qDebug() << "map values = " << fileinfolist.at(i).absoluteFilePath();
 
                     emit signalResetProgressbar(fileinfolist.size(), (*its));
 
@@ -1142,7 +1144,7 @@ void AVHRRSatellite::InsertToMap(QFileInfoList fileinfolist, QMap<QString, QFile
         }
         //0123456789012345678901234567890123456789
         //S3A_SL_1_RBT____20170212T114405_20170212T114705_20170212T135851_0179_014_180_1800_SVL_O_NR_002.zip
-        else if (fileinfo.fileName().mid( 0, 6) == "S3A_SL_1_RBT")
+        else if (fileinfo.fileName().mid( 0, 12) == "S3A_SL_1_RBT")
         {
             *sentinel3Tle = true;
             QDate d(fileinfo.fileName().mid( 16, 4).toInt(), fileinfo.fileName().mid( 20, 2).toInt(), fileinfo.fileName().mid( 22, 2).toInt());
diff --git a/core/datahubaccessmanager.cpp b/core/datahubaccessmanager.cpp
index 315a5e3..7a2524b 100644
--- a/core/datahubaccessmanager.cpp
+++ b/core/datahubaccessmanager.cpp
@@ -128,14 +128,24 @@ void DatahubAccessManager::DownloadXML(QDate selectdate, eDatahub hub)
 
     url = QUrl(strurl);
     // HTTP Basic authentication header value: base64(username:password)
-    QString concatenated;
-    if(this->hub == HUBESA)
-        concatenated = opts.esauser + ":" + opts.esapassword;
-    else
-        concatenated = opts.eumetsatuser + ":" + opts.eumetsatpassword;
+//    QString concatenated;
+//    if(this->hub == HUBESA)
+//        concatenated = opts.esauser + ":" + opts.esapassword;
+//    else
+//        concatenated = opts.eumetsatuser + ":" + opts.eumetsatpassword;
 
-    QByteArray data = concatenated.toLocal8Bit().toBase64();
-    QString headerData = "Basic " + data;
+//    QByteArray data = concatenated.toLocal8Bit().toBase64();
+//    QString headerData = "Basic " + data;
+
+        QString concatenated;
+        concatenated = "hvanruys:china123";
+//        if(this->hub == HUBESA)
+//            concatenated = opts.esauser + ":" + opts.esapassword;
+//        else
+//            concatenated = opts.eumetsatuser + ":" + opts.eumetsatpassword;
+
+        QByteArray data = concatenated.toLocal8Bit().toBase64();
+        QString headerData = "Basic " + data;
 
     QNetworkRequest request(url);
     request.setRawHeader("Authorization", headerData.toLocal8Bit());
diff --git a/core/dialogpreferences.ui b/core/dialogpreferences.ui
index 03d014a..296385a 100644
--- a/core/dialogpreferences.ui
+++ b/core/dialogpreferences.ui
@@ -1692,6 +1692,9 @@
          </item>
          <item>
           <widget class="QLabel" name="label_24">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
            <property name="text">
             <string>Deleting the file 'GeoSatellites.ini' will recreate the file at startup with default values.</string>
            </property>
@@ -1701,6 +1704,9 @@
           <layout class="QHBoxLayout" name="horizontalLayout_26">
            <item>
             <widget class="QLabel" name="label_22">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
              <property name="text">
               <string>When adding or deleting geosatellites restart the program</string>
              </property>
@@ -1721,6 +1727,9 @@
            </item>
            <item>
             <widget class="QPushButton" name="btnAddGeoConfig">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
              <property name="text">
               <string>Add</string>
              </property>
@@ -1728,6 +1737,9 @@
            </item>
            <item>
             <widget class="QPushButton" name="btnDeleteGeoConfig">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
              <property name="text">
               <string>Delete</string>
              </property>
diff --git a/core/formgeostationary.cpp b/core/formgeostationary.cpp
index ead863a..d84e768 100644
--- a/core/formgeostationary.cpp
+++ b/core/formgeostationary.cpp
@@ -26,7 +26,7 @@ FormGeostationary::FormGeostationary(QWidget *parent, SatelliteList *satlist, AV
     segs = seglist;
     sats = satlist;
 
-    qDebug() << "in constructor FormGeostationary";
+    qDebug() << "in constructor FormGeostationary opts.geosatellites.count() = " << opts.geosatellites.count();
 
     for(int i = 0; i < opts.geosatellites.count(); i++)
     {
@@ -280,7 +280,7 @@ void FormGeostationary::PopulateTreeGeo(int geoindex)
         for(int i = 0; i < nbr_spectrum; i++)
         {
             strlist << QString("%1").arg(cnt_spectrum.at(i));
-            qDebug() << "cnt_spectrum " << i << " " << strlist;
+            //qDebug() << "cnt_spectrum " << i << " " << strlist;
         }
 
         newitem = new QTreeWidgetItem( widget, strlist, 0  );
@@ -818,8 +818,10 @@ void FormGeostationary::CreateGeoImagenetCDF(SegmentListGeostationary *sl, QStri
 
     //OR_ABI-L1b-RadF-M4C01_G16_s20161811455312_e20161811500122_c20161811500175.nc
     //01234567890123456789012345678901234567890123456789
-    if(whichgeo == eGeoSatellite::GOES_16 && (type == "VIS_IR" || type == "VIS_IR Color"))
+    if((whichgeo == eGeoSatellite::GOES_16) && (type == "VIS_IR" || type == "VIS_IR Color"))
         filepattern = QString("OR_ABI-L1b-RadF-M????_G16_s") + filetiming + QString("*.nc");
+    else if((whichgeo == eGeoSatellite::GOES_17) && (type == "VIS_IR" || type == "VIS_IR Color"))
+        filepattern = QString("OR_ABI-L1b-RadF-M????_G17_s") + filetiming + QString("*.nc");
     else
         return;
 
diff --git a/core/formimage.cpp b/core/formimage.cpp
index d9bc805..ccd1866 100644
--- a/core/formimage.cpp
+++ b/core/formimage.cpp
@@ -1988,7 +1988,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
                 memcpy(pixelsBlue + i * 550 * 5500, imageptrs->ptrBlue[i], 550 * 5500 * sizeof(quint16));
         }
     }
-    else if(sl->getKindofImage() == "VIS_IR Color" && sl->getGeoSatellite() == eGeoSatellite::GOES_16)
+    else if(sl->getKindofImage() == "VIS_IR Color" && (sl->getGeoSatellite() == eGeoSatellite::GOES_16 || sl->getGeoSatellite() == eGeoSatellite::GOES_17))
     {
         pixelsRed = new quint16[npix];
         pixelsGreen = new quint16[npix];
@@ -2064,7 +2064,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
         pixelsRed = new quint16[npix];
         memcpy(pixelsRed, imageptrs->ptrRed[0], npix * sizeof(quint16));
     }
-    else if(sl->getKindofImage() == "VIS_IR" && (sl->getGeoSatellite() == eGeoSatellite::GOES_16 ))
+    else if(sl->getKindofImage() == "VIS_IR" && (sl->getGeoSatellite() == eGeoSatellite::GOES_16 || sl->getGeoSatellite() == eGeoSatellite::GOES_17 ))
     {
         pixelsRed = new quint16[npix];
         memcpy(pixelsRed, imageptrs->ptrRed[0], npix * sizeof(quint16));
@@ -2108,7 +2108,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
         imageptrs->CLAHE(pixelsGreen, 5500, 5500, 0, 1023, 10, 10, 256, opts.clahecliplimit);
         imageptrs->CLAHE(pixelsBlue, 5500, 5500, 0, 1023, 10, 10, 256, opts.clahecliplimit);
     }
-    else if(sl->getKindofImage() == "VIS_IR Color" && sl->getGeoSatellite() == eGeoSatellite::GOES_16 )
+    else if(sl->getKindofImage() == "VIS_IR Color" && (sl->getGeoSatellite() == eGeoSatellite::GOES_16 || sl->getGeoSatellite() == eGeoSatellite::GOES_17) )
     {
         ret = imageptrs->CLAHE(pixelsRed, 5424, 5424, 0, 1023, 16, 16, 256, opts.clahecliplimit);
         qDebug() << QString("pixelsRed ret = %1").arg(ret);
@@ -2152,7 +2152,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
         }
         else if(sl->getGeoSatellite() == eGeoSatellite::FY2E || sl->getGeoSatellite() == eGeoSatellite::FY2G)
             imageptrs->CLAHE(pixelsRed, 2288, 2288, 0, 255, 16, 16, 256, opts.clahecliplimit);
-        else if(sl->getGeoSatellite() == eGeoSatellite::GOES_16)
+        else if(sl->getGeoSatellite() == eGeoSatellite::GOES_16 || sl->getGeoSatellite() == eGeoSatellite::GOES_17)
             imageptrs->CLAHE(pixelsRed, 5424, 5424, 0, 1023, 16, 16, 256, opts.clahecliplimit);
         else if(sl->getGeoSatellite() == eGeoSatellite::H8)
             imageptrs->CLAHE(pixelsRed, 5500, 5500, 0, 1023, 10, 10, 256, opts.clahecliplimit);
@@ -2207,7 +2207,7 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
             }
         }
     }
-    else if(sl->getKindofImage() == "VIS_IR Color" && sl->getGeoSatellite() == eGeoSatellite::GOES_16)
+    else if(sl->getKindofImage() == "VIS_IR Color" && (sl->getGeoSatellite() == eGeoSatellite::GOES_16 || sl->getGeoSatellite() == eGeoSatellite::GOES_17))
     {
 
         for (int line = 0; line < 5424; line++)
@@ -2398,9 +2398,9 @@ void FormImage::recalculateCLAHE(QVector<QString> spectrumvector, QVector<bool>
                 }
             }
         }
-        else if(sl->getGeoSatellite() == eGeoSatellite::GOES_16)
+        else if(sl->getGeoSatellite() == eGeoSatellite::GOES_16 || sl->getGeoSatellite() == eGeoSatellite::GOES_17)
         {
-            qDebug() << "recalculate CLAHE ; VIS_IR and GOES_16 move to ptrImageGeostationary";
+            qDebug() << "recalculate CLAHE ; VIS_IR and GOES_16/_17 move to ptrImageGeostationary";
 
             for (int line = 0; line < 5424; line++)
             {
@@ -2536,7 +2536,7 @@ void FormImage::recalculateCLAHE1(QVector<QString> spectrumvector, QVector<bool>
 
     }
 
-    if(sl->getGeoSatellite() == eGeoSatellite::GOES_16)
+    if(sl->getGeoSatellite() == eGeoSatellite::GOES_16 || sl->getGeoSatellite() == eGeoSatellite::GOES_17)
     {
         if(sl->getKindofImage() == "VIS_IR Color")
         {
@@ -3527,7 +3527,7 @@ void FormImage::setupGeoOverlay(int geoindex)
 
                     if(lon_deg < 90.0 || lon_deg > -90.0)
                     {
-                        if(opts.geosatellites.at(geoindex).shortname == "GOES_16")
+                        if(opts.geosatellites.at(geoindex).shortname == "GOES_16" || opts.geosatellites.at(geoindex).shortname == "GOES_17")
                         {
                             pixconv.earth_to_fgf_(&sat, &lon_deg, &lat_deg, &scale_x, &offset_x, &scale_y, &offset_y, &sub_lon, &fgf_x, &fgf_y);
                             if(fgf_x >= 0 && fgf_x < opts.geosatellites.at(geoindex).imagewidth && fgf_y >= 0 && fgf_y < opts.geosatellites.at(geoindex).imageheight)
diff --git a/core/formtoolbox.cpp b/core/formtoolbox.cpp
index ce57fb2..00b0a3c 100644
--- a/core/formtoolbox.cpp
+++ b/core/formtoolbox.cpp
@@ -2097,7 +2097,7 @@ void FormToolbox::on_btnGeoColor_clicked()
         ui->pbProgress->setMaximum(100);
     else if(geoindex == (int)eGeoSatellite::H8)
         ui->pbProgress->setMaximum(10+10+10);
-    else if(geoindex == (int)eGeoSatellite::GOES_16)
+    else if(geoindex == (int)eGeoSatellite::GOES_16 || geoindex == (int)eGeoSatellite::GOES_17)
         ui->pbProgress->setMaximum(100);
 
     onButtonColorHRV("VIS_IR Color");
@@ -2474,87 +2474,95 @@ void FormToolbox::onButtonColorHRV(QString type)
             inversevector[ui->comboGeo16->currentIndex()-1] = ui->chkInverseGeo16->isChecked();
         }
     }
-    else if(geoindex == (int)eGeoSatellite::GOES_16 )
+    else if(geoindex == (int)eGeoSatellite::GOES_16 || geoindex == (int)eGeoSatellite::GOES_17 )
     {
-        if(ui->comboGeo1->currentIndex() > 0)
-        {
-            spectrumvector[ui->comboGeo1->currentIndex()-1] = "C01";
-            inversevector[ui->comboGeo1->currentIndex()-1] = ui->chkInverseGeo1->isChecked();
-        }
-        if(ui->comboGeo2->currentIndex() > 0)
-        {
-            spectrumvector[ui->comboGeo2->currentIndex()-1] = "C02";
-            inversevector[ui->comboGeo2->currentIndex()-1] = ui->chkInverseGeo2->isChecked();
-        }
-        if(ui->comboGeo3->currentIndex() > 0)
-        {
-            spectrumvector[ui->comboGeo3->currentIndex()-1] = "C03";
-            inversevector[ui->comboGeo3->currentIndex()-1] = ui->chkInverseGeo3->isChecked();
-        }
-        if(ui->comboGeo4->currentIndex() > 0)
-        {
-            spectrumvector[ui->comboGeo4->currentIndex()-1] = "C04";
-            inversevector[ui->comboGeo4->currentIndex()-1] = ui->chkInverseGeo4->isChecked();
-        }
-        if(ui->comboGeo5->currentIndex() > 0)
-        {
-            spectrumvector[ui->comboGeo5->currentIndex()-1] = "C05";
-            inversevector[ui->comboGeo5->currentIndex()-1] = ui->chkInverseGeo5->isChecked();
-        }
-        if(ui->comboGeo6->currentIndex() > 0)
+        if(ui->rdbPseudoColor->isChecked())
         {
-            spectrumvector[ui->comboGeo6->currentIndex()-1] = "C06";
-            inversevector[ui->comboGeo6->currentIndex()-1] = ui->chkInverseGeo6->isChecked();
+            spectrumvector.clear();
+            spectrumvector << "C02" << "C03" << "C01";
         }
-        if(ui->comboGeo7->currentIndex() > 0)
-        {
-            spectrumvector[ui->comboGeo7->currentIndex()-1] = "C07";
-            inversevector[ui->comboGeo7->currentIndex()-1] = ui->chkInverseGeo7->isChecked();
-        }
-        if(ui->comboGeo8->currentIndex() > 0)
-        {
-            spectrumvector[ui->comboGeo8->currentIndex()-1] = "C08";
-            inversevector[ui->comboGeo8->currentIndex()-1] = ui->chkInverseGeo8->isChecked();
-        }
-        if(ui->comboGeo9->currentIndex() > 0)
-        {
-            spectrumvector[ui->comboGeo9->currentIndex()-1] = "C09";
-            inversevector[ui->comboGeo9->currentIndex()-1] = ui->chkInverseGeo9->isChecked();
-        }
-        if(ui->comboGeo10->currentIndex() > 0)
-        {
-            spectrumvector[ui->comboGeo10->currentIndex()-1] = "C10";
-            inversevector[ui->comboGeo10->currentIndex()-1] = ui->chkInverseGeo10->isChecked();
-        }
-        if(ui->comboGeo11->currentIndex() > 0)
-        {
-            spectrumvector[ui->comboGeo11->currentIndex()-1] = "C11";
-            inversevector[ui->comboGeo11->currentIndex()-1] = ui->chkInverseGeo11->isChecked();
-        }
-        if(ui->comboGeo12->currentIndex() > 0)
-        {
-            spectrumvector[ui->comboGeo12->currentIndex()-1] = "C12";
-            inversevector[ui->comboGeo12->currentIndex()-1] = ui->chkInverseGeo12->isChecked();
-        }
-        if(ui->comboGeo13->currentIndex() > 0)
-        {
-            spectrumvector[ui->comboGeo13->currentIndex()-1] = "C13";
-            inversevector[ui->comboGeo13->currentIndex()-1] = ui->chkInverseGeo13->isChecked();
-        }
-        if(ui->comboGeo14->currentIndex() > 0)
-        {
-            spectrumvector[ui->comboGeo14->currentIndex()-1] = "C14";
-            inversevector[ui->comboGeo14->currentIndex()-1] = ui->chkInverseGeo14->isChecked();
-        }
-        if(ui->comboGeo15->currentIndex() > 0)
-        {
-            spectrumvector[ui->comboGeo15->currentIndex()-1] = "C15";
-            inversevector[ui->comboGeo15->currentIndex()-1] = ui->chkInverseGeo15->isChecked();
-        }
-        if(ui->comboGeo16->currentIndex() > 0)
+        else
         {
-            spectrumvector[ui->comboGeo16->currentIndex()-1] = "C16";
-            inversevector[ui->comboGeo16->currentIndex()-1] = ui->chkInverseGeo16->isChecked();
+            if(ui->comboGeo1->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo1->currentIndex()-1] = "C01";
+                inversevector[ui->comboGeo1->currentIndex()-1] = ui->chkInverseGeo1->isChecked();
+            }
+            if(ui->comboGeo2->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo2->currentIndex()-1] = "C02";
+                inversevector[ui->comboGeo2->currentIndex()-1] = ui->chkInverseGeo2->isChecked();
+            }
+            if(ui->comboGeo3->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo3->currentIndex()-1] = "C03";
+                inversevector[ui->comboGeo3->currentIndex()-1] = ui->chkInverseGeo3->isChecked();
+            }
+            if(ui->comboGeo4->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo4->currentIndex()-1] = "C04";
+                inversevector[ui->comboGeo4->currentIndex()-1] = ui->chkInverseGeo4->isChecked();
+            }
+            if(ui->comboGeo5->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo5->currentIndex()-1] = "C05";
+                inversevector[ui->comboGeo5->currentIndex()-1] = ui->chkInverseGeo5->isChecked();
+            }
+            if(ui->comboGeo6->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo6->currentIndex()-1] = "C06";
+                inversevector[ui->comboGeo6->currentIndex()-1] = ui->chkInverseGeo6->isChecked();
+            }
+            if(ui->comboGeo7->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo7->currentIndex()-1] = "C07";
+                inversevector[ui->comboGeo7->currentIndex()-1] = ui->chkInverseGeo7->isChecked();
+            }
+            if(ui->comboGeo8->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo8->currentIndex()-1] = "C08";
+                inversevector[ui->comboGeo8->currentIndex()-1] = ui->chkInverseGeo8->isChecked();
+            }
+            if(ui->comboGeo9->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo9->currentIndex()-1] = "C09";
+                inversevector[ui->comboGeo9->currentIndex()-1] = ui->chkInverseGeo9->isChecked();
+            }
+            if(ui->comboGeo10->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo10->currentIndex()-1] = "C10";
+                inversevector[ui->comboGeo10->currentIndex()-1] = ui->chkInverseGeo10->isChecked();
+            }
+            if(ui->comboGeo11->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo11->currentIndex()-1] = "C11";
+                inversevector[ui->comboGeo11->currentIndex()-1] = ui->chkInverseGeo11->isChecked();
+            }
+            if(ui->comboGeo12->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo12->currentIndex()-1] = "C12";
+                inversevector[ui->comboGeo12->currentIndex()-1] = ui->chkInverseGeo12->isChecked();
+            }
+            if(ui->comboGeo13->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo13->currentIndex()-1] = "C13";
+                inversevector[ui->comboGeo13->currentIndex()-1] = ui->chkInverseGeo13->isChecked();
+            }
+            if(ui->comboGeo14->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo14->currentIndex()-1] = "C14";
+                inversevector[ui->comboGeo14->currentIndex()-1] = ui->chkInverseGeo14->isChecked();
+            }
+            if(ui->comboGeo15->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo15->currentIndex()-1] = "C15";
+                inversevector[ui->comboGeo15->currentIndex()-1] = ui->chkInverseGeo15->isChecked();
+            }
+            if(ui->comboGeo16->currentIndex() > 0)
+            {
+                spectrumvector[ui->comboGeo16->currentIndex()-1] = "C16";
+                inversevector[ui->comboGeo16->currentIndex()-1] = ui->chkInverseGeo16->isChecked();
+            }
         }
     }
 
diff --git a/core/formtoolbox.ui b/core/formtoolbox.ui
index 5b8634c..17d77be 100644
--- a/core/formtoolbox.ui
+++ b/core/formtoolbox.ui
@@ -9,7 +9,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>535</width>
+    <width>543</width>
     <height>1264</height>
    </rect>
   </property>
@@ -65,45 +65,45 @@
             <colorrole role="Button">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>156</red>
-               <green>243</green>
-               <blue>247</blue>
+               <red>138</red>
+               <green>226</green>
+               <blue>52</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Light">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>255</red>
+               <red>198</red>
                <green>255</green>
-               <blue>255</blue>
+               <blue>143</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Midlight">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>205</red>
-               <green>249</green>
-               <blue>251</blue>
+               <red>168</red>
+               <green>240</green>
+               <blue>97</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Dark">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>78</red>
-               <green>121</green>
-               <blue>123</blue>
+               <red>69</red>
+               <green>113</green>
+               <blue>26</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Mid">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>104</red>
-               <green>162</green>
-               <blue>165</blue>
+               <red>92</red>
+               <green>151</green>
+               <blue>34</blue>
               </color>
              </brush>
             </colorrole>
@@ -146,9 +146,9 @@
             <colorrole role="Window">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>156</red>
-               <green>243</green>
-               <blue>247</blue>
+               <red>138</red>
+               <green>226</green>
+               <blue>52</blue>
               </color>
              </brush>
             </colorrole>
@@ -164,9 +164,9 @@
             <colorrole role="AlternateBase">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>205</red>
-               <green>249</green>
-               <blue>251</blue>
+               <red>196</red>
+               <green>240</green>
+               <blue>153</blue>
               </color>
              </brush>
             </colorrole>
@@ -188,6 +188,15 @@
               </color>
              </brush>
             </colorrole>
+            <colorrole role="PlaceholderText">
+             <brush brushstyle="SolidPattern">
+              <color alpha="128">
+               <red>0</red>
+               <green>0</green>
+               <blue>0</blue>
+              </color>
+             </brush>
+            </colorrole>
            </active>
            <inactive>
             <colorrole role="WindowText">
@@ -202,45 +211,45 @@
             <colorrole role="Button">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>156</red>
-               <green>243</green>
-               <blue>247</blue>
+               <red>138</red>
+               <green>226</green>
+               <blue>52</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Light">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>255</red>
+               <red>198</red>
                <green>255</green>
-               <blue>255</blue>
+               <blue>143</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Midlight">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>205</red>
-               <green>249</green>
-               <blue>251</blue>
+               <red>168</red>
+               <green>240</green>
+               <blue>97</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Dark">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>78</red>
-               <green>121</green>
-               <blue>123</blue>
+               <red>69</red>
+               <green>113</green>
+               <blue>26</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Mid">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>104</red>
-               <green>162</green>
-               <blue>165</blue>
+               <red>92</red>
+               <green>151</green>
+               <blue>34</blue>
               </color>
              </brush>
             </colorrole>
@@ -283,9 +292,9 @@
             <colorrole role="Window">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>156</red>
-               <green>243</green>
-               <blue>247</blue>
+               <red>138</red>
+               <green>226</green>
+               <blue>52</blue>
               </color>
              </brush>
             </colorrole>
@@ -301,9 +310,9 @@
             <colorrole role="AlternateBase">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>205</red>
-               <green>249</green>
-               <blue>251</blue>
+               <red>196</red>
+               <green>240</green>
+               <blue>153</blue>
               </color>
              </brush>
             </colorrole>
@@ -325,68 +334,77 @@
               </color>
              </brush>
             </colorrole>
+            <colorrole role="PlaceholderText">
+             <brush brushstyle="SolidPattern">
+              <color alpha="128">
+               <red>0</red>
+               <green>0</green>
+               <blue>0</blue>
+              </color>
+             </brush>
+            </colorrole>
            </inactive>
            <disabled>
             <colorrole role="WindowText">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>78</red>
-               <green>121</green>
-               <blue>123</blue>
+               <red>69</red>
+               <green>113</green>
+               <blue>26</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Button">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>156</red>
-               <green>243</green>
-               <blue>247</blue>
+               <red>138</red>
+               <green>226</green>
+               <blue>52</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Light">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>255</red>
+               <red>198</red>
                <green>255</green>
-               <blue>255</blue>
+               <blue>143</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Midlight">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>205</red>
-               <green>249</green>
-               <blue>251</blue>
+               <red>168</red>
+               <green>240</green>
+               <blue>97</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Dark">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>78</red>
-               <green>121</green>
-               <blue>123</blue>
+               <red>69</red>
+               <green>113</green>
+               <blue>26</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Mid">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>104</red>
-               <green>162</green>
-               <blue>165</blue>
+               <red>92</red>
+               <green>151</green>
+               <blue>34</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Text">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>78</red>
-               <green>121</green>
-               <blue>123</blue>
+               <red>69</red>
+               <green>113</green>
+               <blue>26</blue>
               </color>
              </brush>
             </colorrole>
@@ -402,27 +420,27 @@
             <colorrole role="ButtonText">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>78</red>
-               <green>121</green>
-               <blue>123</blue>
+               <red>69</red>
+               <green>113</green>
+               <blue>26</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Base">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>156</red>
-               <green>243</green>
-               <blue>247</blue>
+               <red>138</red>
+               <green>226</green>
+               <blue>52</blue>
               </color>
              </brush>
             </colorrole>
             <colorrole role="Window">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>156</red>
-               <green>243</green>
-               <blue>247</blue>
+               <red>138</red>
+               <green>226</green>
+               <blue>52</blue>
               </color>
              </brush>
             </colorrole>
@@ -438,9 +456,9 @@
             <colorrole role="AlternateBase">
              <brush brushstyle="SolidPattern">
               <color alpha="255">
-               <red>156</red>
-               <green>243</green>
-               <blue>247</blue>
+               <red>138</red>
+               <green>226</green>
+               <blue>52</blue>
               </color>
              </brush>
             </colorrole>
@@ -462,6 +480,15 @@
               </color>
              </brush>
             </colorrole>
+            <colorrole role="PlaceholderText">
+             <brush brushstyle="SolidPattern">
+              <color alpha="128">
+               <red>0</red>
+               <green>0</green>
+               <blue>0</blue>
+              </color>
+             </brush>
+            </colorrole>
            </disabled>
           </palette>
          </property>
@@ -4957,7 +4984,7 @@
           <string extracomment="Select C01 = B, C02 = R and C03 = G"/>
          </property>
          <property name="text">
-          <string>Pseudo True Color for GOES-16 ( C01 = B, C02 = R and C03 = G)</string>
+          <string>Pseudo True Color GOES-16/-17 ( C01 = B, C02 = R and C03 = G)</string>
          </property>
         </widget>
        </item>
@@ -5531,7 +5558,7 @@
                 <rect>
                  <x>0</x>
                  <y>0</y>
-                 <width>432</width>
+                 <width>440</width>
                  <height>529</height>
                 </rect>
                </property>
diff --git a/core/generalverticalperspective.cpp b/core/generalverticalperspective.cpp
index 5596667..0d2400b 100644
--- a/core/generalverticalperspective.cpp
+++ b/core/generalverticalperspective.cpp
@@ -364,7 +364,7 @@ void GeneralVerticalPerspective::CreateMapFromGeoStationary()
 
                     }
                 }
-                else if(sl->getGeoSatellite() == eGeoSatellite::GOES_16)
+                else if(sl->getGeoSatellite() == eGeoSatellite::GOES_16 || sl->getGeoSatellite() == eGeoSatellite::GOES_17)
                 {
                     lon_deg = lon_rad * 180.0 / PI;
                     lat_deg = lat_rad * 180.0 / PI;
diff --git a/core/globals.h b/core/globals.h
index 763d1c6..7943f1e 100644
--- a/core/globals.h
+++ b/core/globals.h
@@ -76,8 +76,9 @@ enum class eGeoSatellite {
     FY2G = 6,
     GOES_15 = 7,
     GOES_16 = 8,
-    H8 = 9,
-    NOGEO = 10
+    GOES_17 = 9,
+    H8 = 10,
+    NOGEO = 11
 };
 
 //1 "Airmass RGB"
diff --git a/core/lambertconformalconic.cpp b/core/lambertconformalconic.cpp
index 3a51c0a..583da29 100644
--- a/core/lambertconformalconic.cpp
+++ b/core/lambertconformalconic.cpp
@@ -442,7 +442,7 @@ void LambertConformalConic::CreateMapFromGeostationary()
                         }
                     }
                 }
-                else if(sl->getGeoSatellite() == eGeoSatellite::GOES_16)
+                else if(sl->getGeoSatellite() == eGeoSatellite::GOES_16 || sl->getGeoSatellite() == eGeoSatellite::GOES_17)
                 {
                     lon_deg = lon_rad * 180.0 / PI;
                     lat_deg = lat_rad * 180.0 / PI;
diff --git a/core/main.cpp b/core/main.cpp
index b7896d9..01317a0 100644
--- a/core/main.cpp
+++ b/core/main.cpp
@@ -12,7 +12,7 @@
 
 #include <QMutex>
 
-#define APPVERSION "1.4.4"
+#define APPVERSION "1.4.5"
 
 using namespace std;
 
@@ -79,6 +79,8 @@ void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QS
         break;
     case QtFatalMsg:
         strout = "Debug Fatal: " + msg + "\n";
+        out << strout;
+        fprintf(stderr, strout.toStdString().c_str());
         abort();
     }
 
diff --git a/core/options.cpp b/core/options.cpp
index 5d6b161..8563367 100644
--- a/core/options.cpp
+++ b/core/options.cpp
@@ -257,17 +257,22 @@ void Options::Initialize(bool recreate_geo_ini)
     mainwindowstate = settings.value("/window/mainwindowstate").toByteArray();
 
 
-    if(recreate_geo_ini)
-    {
-        QFile file("GeoSatellites.ini");
-        if (!file.open(QIODevice::ReadOnly))
-        {
-            CreateGeoSatelliteIni();
-            file.close();
-        }
-    }
-    else
-        InitializeGeo();
+    CreateGeoSatelliteIni();
+
+
+//    if(recreate_geo_ini)
+//    {
+//        QFile file("GeoSatellites.ini");
+//        if (!file.open(QIODevice::ReadOnly))
+//        {
+//            CreateGeoSatelliteIni();
+//            file.close();
+//        }
+//    }
+//    else
+//        InitializeGeo();
+
+
 
 
 }
@@ -706,7 +711,7 @@ void Options::CreateGeoSatelliteIni()
     QSettings settingsgeo( "GeoSatellites.ini", QSettings::IniFormat);
 
     GeoSatellites sat;
-    for(int i = 0; i < 10; i++)
+    for(int i = 0; i < 11; i++)
         geosatellites.append(sat);
 
     //Data Channel 2
@@ -1092,7 +1097,6 @@ void Options::CreateGeoSatelliteIni()
     geosatellites[7].rss = false;
     geosatellites[7].searchstring = "L-000-MSG4__-GOES15";
     geosatellites[7].indexsearchstring = 0;
-//    geosatellites[7].filepattern =  "L-???-??????-GOES15*%1-__";
     geosatellites[7].filepattern =  "L-???-??????-GOES15______-?????????-00000?___-%1-__";
     geosatellites[7].imagewidth = 2816;
     geosatellites[7].imageheight = 3248;
@@ -1146,12 +1150,12 @@ void Options::CreateGeoSatelliteIni()
     geosatellites[8].fullname = "GOES 16";
     geosatellites[8].shortname = "GOES_16";
     geosatellites[8].longitude = -75.0;
-    geosatellites[8].longitudelimit1 = -154.4;
-    geosatellites[8].longitudelimit2 = -30.0;
+    geosatellites[8].longitudelimit1 = 0;
+    geosatellites[8].longitudelimit2 = 0;
     geosatellites[8].protocol = "netCDF";
     geosatellites[8].rss = false;
-    geosatellites[8].searchstring = "OR_ABI";
-    geosatellites[8].indexsearchstring = 0;
+    geosatellites[8].searchstring = "_G16_";
+    geosatellites[8].indexsearchstring = 21;
     geosatellites[8].filepattern =  "";
 
     geosatellites[8].imagewidth = 5424;
@@ -1206,29 +1210,34 @@ void Options::CreateGeoSatelliteIni()
     geosatellites[8].spectrumvalueslist << "0.47" << "0.64" << "0.86" << "1.37" << "1.61" << "2.24" << "3.89" << "6.17" << "6.93" << "7.34" << "8.44" << "9.61" << "10.33"  << "11.2"
                                         << "12.3" << "13.3";
 
-    //E1B-TPG-1 E1H-TPG-2
-    geosatellites[9].fullname = "Himawari 8";
-    geosatellites[9].shortname = "H8";
-    geosatellites[9].longitude = 140.7;
-    geosatellites[9].longitudelimit1 = 92.0;
-    geosatellites[9].longitudelimit2 = 250.0;
-    geosatellites[9].protocol = "XRIT";
+
+    //
+    geosatellites[9].fullname = "GOES 17";
+    geosatellites[9].shortname = "GOES_17";
+    geosatellites[9].longitude = -137.2;
+    geosatellites[9].longitudelimit1 = 0;
+    geosatellites[9].longitudelimit2 = 0;
+    geosatellites[9].protocol = "netCDF";
     geosatellites[9].rss = false;
-    geosatellites[9].searchstring = "IMG_DK01";
-    geosatellites[9].indexsearchstring = 0;
-    geosatellites[9].filepattern = "IMG_DK01???_%1*";
-    geosatellites[9].imagewidth = 5500;
-    geosatellites[9].imageheight = 5500;
+    geosatellites[9].searchstring = "_G17_";
+    geosatellites[9].indexsearchstring = 21;
+    geosatellites[9].filepattern =  "";
+
+    geosatellites[9].imagewidth = 5424;
+    geosatellites[9].imageheight = 5424;
     geosatellites[9].imagewidthhrv0 = 0;
     geosatellites[9].imageheighthrv0 = 0;
     geosatellites[9].imagewidthhrv1 = 0;
     geosatellites[9].imageheighthrv1 = 0;
 
-    geosatellites[9].indexspectrum = 8;
-    geosatellites[9].indexfilenbr = 25;
-    geosatellites[9].lengthfilenbr = 3;
-    geosatellites[9].indexdate = 12;
-    geosatellites[9].lengthdate = 11;
+    //0123456789012345678901234567890123456789012345678901234567890123456789012
+    //OR_ABI-L1b-RadF-M4C01_G16_s20161811455312_e20161811500122_c20161811500175.nc
+
+    geosatellites[9].indexspectrum = 18;
+    geosatellites[9].indexfilenbr = 0;
+    geosatellites[9].lengthfilenbr = 0;
+    geosatellites[9].indexdate = 27;
+    geosatellites[9].lengthdate = 11; //YYYYDDDHHmm
 
     geosatellites[9].spectrumhrv = "";
     geosatellites[9].spectrumvaluehrv = "";
@@ -1239,31 +1248,91 @@ void Options::CreateGeoSatelliteIni()
     geosatellites[9].lengthdatehrv = 0;
 
     geosatellites[9].color = true;
-    geosatellites[9].maxsegments = 10;
+    geosatellites[9].maxsegments = 1;
     geosatellites[9].maxsegmentshrv = 0;
-    geosatellites[9].segmentlength = 550;
+    geosatellites[9].segmentlength = 5424;
     geosatellites[9].segmentlengthhrv = 0;
     geosatellites[9].startsegmentnbrtype0 = 1;
     geosatellites[9].startsegmentnbrhrvtype0 = 1;
     geosatellites[9].startsegmentnbrtype1 = 1;
     geosatellites[9].startsegmentnbrhrvtype1 = 1;
-    geosatellites[9].clahecontextregionx = 10;
-    geosatellites[9].clahecontextregiony = 10;
+    geosatellites[9].clahecontextregionx = 16;
+    geosatellites[9].clahecontextregiony = 16;
 
     geosatellites[9].prologfile = false;
     geosatellites[9].epilogfile = false;
-    geosatellites[9].coff = 2750;
-    geosatellites[9].loff = 2750;
-    geosatellites[9].cfac = 1172050000.;
-    geosatellites[9].lfac = 1172050000.;
+    geosatellites[9].coff = 2712;
+    geosatellites[9].loff = 2712;
+    geosatellites[9].cfac = 1170000000.;
+    geosatellites[9].lfac = 1170000000.;
     geosatellites[9].coffhrv = 0;
     geosatellites[9].loffhrv = 0;
     geosatellites[9].cfachrv = 0.;
     geosatellites[9].lfachrv = 0.;
 
 
-    geosatellites[9].spectrumlist << "B01" << "B02" << "VIS" << "B04" << "B05" << "B06" << "IR4" << "IR3" << "B09" << "B10" << "B11" << "B12" << "IR1" << "B14" << "IR2" << "B16";
-    geosatellites[9].spectrumvalueslist << "0.46" << "0.51" << "0.64" << "0.86" << "1.6" << "2.3" << "3.9" << "6.2" << "6.9" << "7.3" << "8.6" << "9.6" << "10.4" << "11.2" << "12.4" << "13.3";
+    geosatellites[9].spectrumlist << "C01" << "C02" << "C03" << "C04" << "C05" << "C06" << "C07" << "C08" << "C09" << "C10" << "C11" << "C12" << "C13" << "C14" << "C15" << "C16";
+    geosatellites[9].spectrumvalueslist << "0.47" << "0.64" << "0.86" << "1.37" << "1.61" << "2.24" << "3.89" << "6.17" << "6.93" << "7.34" << "8.44" << "9.61" << "10.33"  << "11.2"
+                                        << "12.3" << "13.3";
+
+    //E1B-TPG-1 E1H-TPG-2
+    geosatellites[10].fullname = "Himawari 8";
+    geosatellites[10].shortname = "H8";
+    geosatellites[10].longitude = 140.7;
+    geosatellites[10].longitudelimit1 = 92.0;
+    geosatellites[10].longitudelimit2 = 250.0;
+    geosatellites[10].protocol = "XRIT";
+    geosatellites[10].rss = false;
+    geosatellites[10].searchstring = "IMG_DK01";
+    geosatellites[10].indexsearchstring = 0;
+    geosatellites[10].filepattern = "IMG_DK01???_%1*";
+    geosatellites[10].imagewidth = 5500;
+    geosatellites[10].imageheight = 5500;
+    geosatellites[10].imagewidthhrv0 = 0;
+    geosatellites[10].imageheighthrv0 = 0;
+    geosatellites[10].imagewidthhrv1 = 0;
+    geosatellites[10].imageheighthrv1 = 0;
+
+    geosatellites[10].indexspectrum = 8;
+    geosatellites[10].indexfilenbr = 25;
+    geosatellites[10].lengthfilenbr = 3;
+    geosatellites[10].indexdate = 12;
+    geosatellites[10].lengthdate = 11;
+
+    geosatellites[10].spectrumhrv = "";
+    geosatellites[10].spectrumvaluehrv = "";
+    geosatellites[10].indexspectrumhrv = 0;
+    geosatellites[10].indexfilenbrhrv = 0;
+    geosatellites[10].lengthfilenbrhrv = 0;
+    geosatellites[10].indexdatehrv = 0;
+    geosatellites[10].lengthdatehrv = 0;
+
+    geosatellites[10].color = true;
+    geosatellites[10].maxsegments = 10;
+    geosatellites[10].maxsegmentshrv = 0;
+    geosatellites[10].segmentlength = 550;
+    geosatellites[10].segmentlengthhrv = 0;
+    geosatellites[10].startsegmentnbrtype0 = 1;
+    geosatellites[10].startsegmentnbrhrvtype0 = 1;
+    geosatellites[10].startsegmentnbrtype1 = 1;
+    geosatellites[10].startsegmentnbrhrvtype1 = 1;
+    geosatellites[10].clahecontextregionx = 10;
+    geosatellites[10].clahecontextregiony = 10;
+
+    geosatellites[10].prologfile = false;
+    geosatellites[10].epilogfile = false;
+    geosatellites[10].coff = 2750;
+    geosatellites[10].loff = 2750;
+    geosatellites[10].cfac = 1172050000.;
+    geosatellites[10].lfac = 1172050000.;
+    geosatellites[10].coffhrv = 0;
+    geosatellites[10].loffhrv = 0;
+    geosatellites[10].cfachrv = 0.;
+    geosatellites[10].lfachrv = 0.;
+
+
+    geosatellites[10].spectrumlist << "B01" << "B02" << "VIS" << "B04" << "B05" << "B06" << "IR4" << "IR3" << "B09" << "B10" << "B11" << "B12" << "IR1" << "B14" << "IR2" << "B16";
+    geosatellites[10].spectrumvalueslist << "0.46" << "0.51" << "0.64" << "0.86" << "1.6" << "2.3" << "3.9" << "6.2" << "6.9" << "7.3" << "8.6" << "9.6" << "10.4" << "11.2" << "12.4" << "13.3";
 
     settingsgeo.beginWriteArray("geos");
     for (int i = 0; i < this->geosatellites.size(); ++i) {
diff --git a/core/poi.cpp b/core/poi.cpp
index ab10427..cb0f5ae 100644
--- a/core/poi.cpp
+++ b/core/poi.cpp
@@ -1,7 +1,8 @@
 #include "poi.h"
+#include "options.h"
 #include <QSettings>
 #include <QDebug>
-
+extern Options opts;
 
 Poi::Poi()
 {
@@ -342,8 +343,8 @@ void Poi::Initialize()
 
     strlComboGeo1 = POIsettings.value("/GeoConfig/strlComboGeo1").value<QStringList>();
 
-    // MET_10, MET_9, MET_8, GOMS2, FY2E, FY2G, GOES_15, GOES_16, H8
-    if(strlComboGeo1.count() != 10)
+    // MET_11, MET_10, MET_9, MET_8, GOMS2, FY2E, FY2G, GOES_15, GOES_16, GOES_17, H8
+    if(strlComboGeo1.count() != opts.geosatellites.count())
     {
         strlComboGeo1.clear();
         strlComboGeo2.clear();
@@ -379,39 +380,39 @@ void Poi::Initialize()
         strlInverseGeo15.clear();
         strlInverseGeo16.clear();
 
-        strlComboGeo1 << "0" << "3" << "3" << "3" << "3" << "3" << "3" << "3" << "0" << "3";
-        strlComboGeo2 << "3" << "2" << "2" << "2" << "2" << "2" << "2" << "2" << "3" << "2";
-        strlComboGeo3 << "2" << "1" << "1" << "1" << "1" << "1" << "1" << "1" << "2" << "1";
-        strlComboGeo4 << "1" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlComboGeo5 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "1" << "0";
-        strlComboGeo6 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlComboGeo7 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlComboGeo8 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlComboGeo9 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlComboGeo10 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlComboGeo11 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlComboGeo12 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlComboGeo13 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlComboGeo14 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlComboGeo15 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlComboGeo16 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-
-        strlInverseGeo1 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlInverseGeo2 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlInverseGeo3 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlInverseGeo4 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlInverseGeo5 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlInverseGeo6 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlInverseGeo7 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlInverseGeo8 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlInverseGeo9 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlInverseGeo10 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlInverseGeo11 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlInverseGeo12 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlInverseGeo13 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlInverseGeo14 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlInverseGeo15 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
-        strlInverseGeo16 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlComboGeo1 << "0" << "3" << "3" << "3" << "3" << "3" << "3" << "3" << "3" << "3" << "0";
+        strlComboGeo2 << "3" << "2" << "2" << "2" << "2" << "2" << "2" << "2" << "1" << "1" << "3";
+        strlComboGeo3 << "2" << "1" << "1" << "1" << "1" << "1" << "1" << "1" << "2" << "2" << "2";
+        strlComboGeo4 << "1" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlComboGeo5 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "1" << "0" << "1";
+        strlComboGeo6 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlComboGeo7 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlComboGeo8 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlComboGeo9 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlComboGeo10 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlComboGeo11 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlComboGeo12 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlComboGeo13 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlComboGeo14 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlComboGeo15 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlComboGeo16 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+
+        strlInverseGeo1 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlInverseGeo2 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlInverseGeo3 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlInverseGeo4 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlInverseGeo5 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlInverseGeo6 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlInverseGeo7 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlInverseGeo8 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlInverseGeo9 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlInverseGeo10 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlInverseGeo11 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlInverseGeo12 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlInverseGeo13 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlInverseGeo14 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlInverseGeo15 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
+        strlInverseGeo16 << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0" << "0";
 
     }
     else
diff --git a/core/segmentlistgeostationary.cpp b/core/segmentlistgeostationary.cpp
index d7c52b4..7f91ad2 100644
--- a/core/segmentlistgeostationary.cpp
+++ b/core/segmentlistgeostationary.cpp
@@ -169,6 +169,8 @@ eGeoSatellite SegmentListGeostationary::getGeoSatellite()
         return eGeoSatellite::GOES_15;
     else if(str_GeoSatellite == "GOES_16")
         return eGeoSatellite::GOES_16;
+    else if(str_GeoSatellite == "GOES_17")
+        return eGeoSatellite::GOES_17;
     else if(str_GeoSatellite == "H8")
         return eGeoSatellite::H8;
     else
@@ -257,6 +259,10 @@ void SegmentListGeostationary::setGeoSatellite(int geoindex, QString strgeo)
     {
         this->m_GeoSatellite = eGeoSatellite::GOES_16;
     }
+    else if(strgeo == "GOES_17")
+    {
+        this->m_GeoSatellite = eGeoSatellite::GOES_17;
+    }
     else if(strgeo == "H8")
     {
         this->m_GeoSatellite = eGeoSatellite::H8;
@@ -471,7 +477,9 @@ bool SegmentListGeostationary::ComposeImageHDFSerial(QFileInfo fileinfo, QVector
 void SegmentListGeostationary::InsertPresent( QVector<QString> spectrumvector, QString filespectrum, int filesequence)
 {
     qDebug() << QString("InsertPresent ; spectrum %1 %2 %3    filespectrum  %4  fileseq %5").arg(spectrumvector[0]).arg(spectrumvector[1]).arg(spectrumvector[2]).arg(filespectrum).arg(filesequence);
-    if(m_GeoSatellite == eGeoSatellite::MET_11 || m_GeoSatellite == eGeoSatellite::MET_10 || m_GeoSatellite == eGeoSatellite::MET_9 || m_GeoSatellite == eGeoSatellite::MET_8 || m_GeoSatellite == eGeoSatellite::H8 || m_GeoSatellite == eGeoSatellite::GOES_16 || m_GeoSatellite == eGeoSatellite::GOMS2)
+    if(m_GeoSatellite == eGeoSatellite::MET_11 || m_GeoSatellite == eGeoSatellite::MET_10 || m_GeoSatellite == eGeoSatellite::MET_9 ||
+            m_GeoSatellite == eGeoSatellite::MET_8 || m_GeoSatellite == eGeoSatellite::H8 || m_GeoSatellite == eGeoSatellite::GOES_16 ||
+            m_GeoSatellite == eGeoSatellite::GOES_17 || m_GeoSatellite == eGeoSatellite::GOMS2)
     {
         if(spectrumvector.at(0) == filespectrum)
         {
@@ -2542,7 +2550,7 @@ bool SegmentListGeostationary::allVIS_IRSegmentsReceived()
 
     if (this->getKindofImage() == "VIS_IR Color")
     {
-        if(m_GeoSatellite == eGeoSatellite::FY2E || m_GeoSatellite == eGeoSatellite::FY2G || m_GeoSatellite == eGeoSatellite::GOES_16)
+        if(m_GeoSatellite == eGeoSatellite::FY2E || m_GeoSatellite == eGeoSatellite::FY2G || m_GeoSatellite == eGeoSatellite::GOES_16 || m_GeoSatellite == eGeoSatellite::GOES_17)
         {
             return true;
         }
@@ -2752,7 +2760,7 @@ bool SegmentListGeostationary::allVIS_IRSegmentsReceived()
                     return false;
             }
         }
-        else if(m_GeoSatellite == eGeoSatellite::FY2E || m_GeoSatellite == eGeoSatellite::FY2G || m_GeoSatellite == eGeoSatellite::GOES_16)
+        else if(m_GeoSatellite == eGeoSatellite::FY2E || m_GeoSatellite == eGeoSatellite::FY2G || m_GeoSatellite == eGeoSatellite::GOES_16 || m_GeoSatellite == eGeoSatellite::GOES_17)
         {
             if (isPresentRed[0] && issegmentcomposedRed[0] == false)
                return false;
diff --git a/core/stereographic.cpp b/core/stereographic.cpp
index 5160cab..6b7c0af 100644
--- a/core/stereographic.cpp
+++ b/core/stereographic.cpp
@@ -258,7 +258,7 @@ void StereoGraphic::CreateMapFromGeostationary()
                         }
                     }
                 }
-                else if(sl->getGeoSatellite() == eGeoSatellite::GOES_16)
+                else if(sl->getGeoSatellite() == eGeoSatellite::GOES_16 || sl->getGeoSatellite() == eGeoSatellite::GOES_17)
                 {
                     lon_deg = lon_rad * 180.0 / PI;
                     lat_deg = lat_rad * 180.0 / PI;