diff --git a/NumericalData/AMDA/ACE/MFI/ace-imf-all.xml b/NumericalData/AMDA/ACE/MFI/ace-imf-all.xml
index ef0eece..ff5614d 100644
--- a/NumericalData/AMDA/ACE/MFI/ace-imf-all.xml
+++ b/NumericalData/AMDA/ACE/MFI/ace-imf-all.xml
@@ -63,7 +63,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>1997-09-02T00:00:12Z</StartDate>
-             <StopDate>2016-10-15T23:59:49Z</StopDate>
+             <StopDate>2017-02-18T23:59:44Z</StopDate>
          </TimeSpan>
          <Cadence>PT16S</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml b/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml
index fbdc1c4..e5de152 100644
--- a/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml
+++ b/NumericalData/AMDA/ACE/MFI/ace-mag-real.xml
@@ -53,7 +53,7 @@
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2014-01-06T00:00:00Z</StartDate>
-             <StopDate>2017-02-17T01:59:59Z</StopDate>
+             <StopDate>2017-02-28T00:59:59Z</StopDate>
          </TimeSpan>
          <Cadence>PT60S</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/ACE/SWEPAM/ace-swe-all.xml b/NumericalData/AMDA/ACE/SWEPAM/ace-swe-all.xml
index 8e5148e..12aaa6a 100644
--- a/NumericalData/AMDA/ACE/SWEPAM/ace-swe-all.xml
+++ b/NumericalData/AMDA/ACE/SWEPAM/ace-swe-all.xml
@@ -61,7 +61,7 @@
    <TemporalDescription>
       <TimeSpan>
          <StartDate>1998-02-04T00:00:31Z</StartDate>
-         <StopDate>2016-04-25T23:59:23Z</StopDate>
+         <StopDate>2016-11-27T23:59:51Z</StopDate>
      </TimeSpan>
      <Cadence>PT64S</Cadence>
    </TemporalDescription>
diff --git a/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml b/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml
index 00f3834..f2d8e09 100644
--- a/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml
+++ b/NumericalData/AMDA/ACE/SWEPAM/ace-swepam-real.xml
@@ -48,7 +48,7 @@
    <TemporalDescription>
       <TimeSpan>
          <StartDate>2014-01-06T00:00:00Z</StartDate>
-         <StopDate>2017-02-17T01:59:59Z</StopDate>
+         <StopDate>2017-02-28T00:59:59Z</StopDate>
      </TimeSpan>
      <Cadence>PT60S</Cadence>
    </TemporalDescription>
diff --git a/NumericalData/AMDA/ACE/SWEPAM/ace-swp-all.xml b/NumericalData/AMDA/ACE/SWEPAM/ace-swp-all.xml
index 4ee3bfe..c28c1ed 100644
--- a/NumericalData/AMDA/ACE/SWEPAM/ace-swp-all.xml
+++ b/NumericalData/AMDA/ACE/SWEPAM/ace-swp-all.xml
@@ -61,7 +61,7 @@
    <TemporalDescription>
       <TimeSpan>
          <StartDate>2001-01-01T00:00:00Z</StartDate>
-         <StopDate>2016-10-15T23:55:00Z</StopDate>
+         <StopDate>2017-02-18T23:55:00Z</StopDate>
      </TimeSpan>
      <Cadence>PT5M</Cadence>
    </TemporalDescription>
diff --git a/NumericalData/AMDA/GEOTAIL/EPIC/gtl-epic-ed.xml b/NumericalData/AMDA/GEOTAIL/EPIC/gtl-epic-ed.xml
index bbfbe2b..3cc768f 100644
--- a/NumericalData/AMDA/GEOTAIL/EPIC/gtl-epic-ed.xml
+++ b/NumericalData/AMDA/GEOTAIL/EPIC/gtl-epic-ed.xml
@@ -9,7 +9,7 @@
          <ReleaseDate>2017-02-12T10:48:29Z</ReleaseDate>
          <Description>*'directionward' (tailward, etc) : the correspondinf sector is taken
                       * Sectors (degrees) : 0., 45., 90., 135., 180., 225., 270., 315.; </Description>
-         <Acknowledgement></Acknowledgement>
+         <Acknowledgement/>
          <Contact>        
              
          </Contact>
@@ -30,15 +30,15 @@
             <URL>http://amda.cdpp.eu</URL>
          </AccessURL>
          <Format>CDF</Format>
-         <Acknowledgement></Acknowledgement>
+         <Acknowledgement/>
       </AccessInformation>
       <ProviderName/> 
       <InstrumentID>spase://CDPP/Instrument/AMDA/GEOTAIL/EPIC</InstrumentID>
       <MeasurementType>EnergeticParticles</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
-             <StartDate>2010-11-29T23:18:19Z</StartDate>
-             <StopDate>2016-02-02T23:56:45Z</StopDate>
+             <StartDate>1992-10-18T00:01:17Z</StartDate>
+             <StopDate>2010-12-31T23:57:50Z</StopDate>
          </TimeSpan>
       <Cadence>PT3S</Cadence>
       </TemporalDescription>
@@ -46,11 +46,11 @@
       <Caveats>
       </Caveats>    
       <Parameter>
-         <Name>integral flux : E > 34 keV</Name>
+         <Name>integral flux : E &gt; 34 keV</Name>
          <ParameterKey>gtl_edhigh_av</ParameterKey>
          <Description/>
          <Ucd/>
-         <Units></Units>
+         <Units/>
          <UnitsConversion/>
          <Structure>
             <Size> </Size>
diff --git a/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml b/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
index ccdd41e..e0c8b9d 100644
--- a/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
+++ b/NumericalData/AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
@@ -49,7 +49,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>2014-06-01T00:00:00Z</StartDate>
-             <StopDate>2017-02-07T20:32:00Z</StopDate>
+             <StopDate>2017-02-14T19:12:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1M</Cadence>
       </TemporalDescription>
diff --git a/NumericalData/AMDA/MEX/IMA/mex-ima-sw.xml b/NumericalData/AMDA/MEX/IMA/mex-ima-sw.xml
index 2a43e76..c6c15e7 100644
--- a/NumericalData/AMDA/MEX/IMA/mex-ima-sw.xml
+++ b/NumericalData/AMDA/MEX/IMA/mex-ima-sw.xml
@@ -31,8 +31,8 @@
         <MeasurementType>ThermalPlasma</MeasurementType>
         <TemporalDescription>
             <TimeSpan>
-                <StartDate>2004-06-26T19:37:50Z</StartDate>
-                <StopDate>2017-01-25T23:21:54Z</StopDate>
+                <StartDate>2006-01-01T23:35:17Z</StartDate>
+                <StopDate>2016-12-31T22:48:16Z</StopDate>
             </TimeSpan>
             <Cadence>PT192S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/Rosetta/IES/ros-elc-en.xml b/NumericalData/AMDA/Rosetta/IES/ros-elc-en.xml
index f307560..98c9def 100644
--- a/NumericalData/AMDA/Rosetta/IES/ros-elc-en.xml
+++ b/NumericalData/AMDA/Rosetta/IES/ros-elc-en.xml
@@ -6,8 +6,8 @@
       <ResourceHeader>
          <ResourceName>Electron energy spectra</ResourceName>
          <ReleaseDate>2017-02-12T10:48:29Z</ReleaseDate>
-         <Description></Description>
-         <Acknowledgement></Acknowledgement>
+         <Description/>
+         <Acknowledgement/>
          <Contact>        
             <PersonID>spase://CDPP/Person/Ray.Goldstein</PersonID>
             <Role>GeneralContact</Role>
@@ -29,7 +29,7 @@
             <URL>http://amda.cdpp.eu</URL>
          </AccessURL>
          <Format>CDF</Format>
-         <Acknowledgement></Acknowledgement>
+         <Acknowledgement/>
       </AccessInformation>
       <ProviderName/> 
       <InstrumentID>spase://CDPP/Instrument/AMDA/Rosetta/IES</InstrumentID>
diff --git a/NumericalData/AMDA/THEMIS/A/Ephemeris/tha-orb-all.xml b/NumericalData/AMDA/THEMIS/A/Ephemeris/tha-orb-all.xml
index d9f2ceb..0667d6b 100644
--- a/NumericalData/AMDA/THEMIS/A/Ephemeris/tha-orb-all.xml
+++ b/NumericalData/AMDA/THEMIS/A/Ephemeris/tha-orb-all.xml
@@ -32,7 +32,7 @@
     <TemporalDescription>
         <TimeSpan>
             <StartDate>2007-02-17T23:36:00Z</StartDate>
-            <StopDate>2016-02-23T23:59:00Z</StopDate>                
+            <StopDate>2017-02-27T23:59:00Z</StopDate>                
         </TimeSpan>
         <Cadence>PT60S</Cadence>
     </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/B/Ephemeris/thb-orb-all.xml b/NumericalData/AMDA/THEMIS/B/Ephemeris/thb-orb-all.xml
index 8027f13..1a391c2 100644
--- a/NumericalData/AMDA/THEMIS/B/Ephemeris/thb-orb-all.xml
+++ b/NumericalData/AMDA/THEMIS/B/Ephemeris/thb-orb-all.xml
@@ -32,7 +32,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-17T23:36:00Z</StartDate>
-                <StopDate>2016-02-23T23:59:00Z</StopDate>                
+                <StopDate>2017-02-27T23:59:00Z</StopDate>                
             </TimeSpan>
             <Cadence>PT60S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/C/Ephemeris/thc-orb-all.xml b/NumericalData/AMDA/THEMIS/C/Ephemeris/thc-orb-all.xml
index 45603ed..f7efac2 100644
--- a/NumericalData/AMDA/THEMIS/C/Ephemeris/thc-orb-all.xml
+++ b/NumericalData/AMDA/THEMIS/C/Ephemeris/thc-orb-all.xml
@@ -32,7 +32,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-17T23:36:00Z</StartDate>
-                <StopDate>2016-02-23T23:59:00Z</StopDate>                
+                <StopDate>2017-02-27T23:59:00Z</StopDate>                
             </TimeSpan>
             <Cadence>PT60S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/D/Ephemeris/thd-orb-all.xml b/NumericalData/AMDA/THEMIS/D/Ephemeris/thd-orb-all.xml
index 05a3a56..1f9ca77 100644
--- a/NumericalData/AMDA/THEMIS/D/Ephemeris/thd-orb-all.xml
+++ b/NumericalData/AMDA/THEMIS/D/Ephemeris/thd-orb-all.xml
@@ -32,7 +32,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-17T23:36:00Z</StartDate>
-                <StopDate>2016-02-23T23:59:00Z</StopDate>                
+                <StopDate>2017-02-27T23:59:00Z</StopDate>                
             </TimeSpan>
             <Cadence>PT60S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/E/Ephemeris/the-orb-all.xml b/NumericalData/AMDA/THEMIS/E/Ephemeris/the-orb-all.xml
index 01e8049..41a098f 100644
--- a/NumericalData/AMDA/THEMIS/E/Ephemeris/the-orb-all.xml
+++ b/NumericalData/AMDA/THEMIS/E/Ephemeris/the-orb-all.xml
@@ -32,7 +32,7 @@
         <TemporalDescription>
             <TimeSpan>
                 <StartDate>2007-02-17T23:36:00Z</StartDate>
-                <StopDate>2016-02-23T23:59:00Z</StopDate>                
+                <StopDate>2017-02-27T23:59:00Z</StopDate>                
             </TimeSpan>
             <Cadence>PT60S</Cadence>
         </TemporalDescription>
diff --git a/NumericalData/AMDA/VEX/IMA/vex-ima-sw.xml b/NumericalData/AMDA/VEX/IMA/vex-ima-sw.xml
index 8b12569..bb915c9 100644
--- a/NumericalData/AMDA/VEX/IMA/vex-ima-sw.xml
+++ b/NumericalData/AMDA/VEX/IMA/vex-ima-sw.xml
@@ -31,8 +31,8 @@
         <MeasurementType>ThermalPlasma</MeasurementType>
         <TemporalDescription>
             <TimeSpan>
-                <StartDate>2004-06-26T19:37:50Z</StartDate>
-                <StopDate>2017-01-25T23:21:54Z</StopDate>
+                <StartDate>2006-05-15T00:56:40Z</StartDate>
+                <StopDate>2014-11-27T06:48:16Z</StopDate>
             </TimeSpan>
             <Cadence>PT192S</Cadence>
         </TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Juno/tao-juno-sw.xml b/NumericalOutput/AMDA/TAO/Juno/tao-juno-sw.xml
index e0e4ba5..d0abc67 100644
--- a/NumericalOutput/AMDA/TAO/Juno/tao-juno-sw.xml
+++ b/NumericalOutput/AMDA/TAO/Juno/tao-juno-sw.xml
@@ -5,7 +5,7 @@
       <ResourceID>spase://CDPP/NumericalOutput/AMDA/TAO/Juno/tao-juno-sw</ResourceID>
       <ResourceHeader>
          <ResourceName>SW / Input OMNI</ResourceName>
-         <AlternateName>Tao SW Juno / Input OMNI</AlternateName>
+         <AlternateName>Tao SW Juno / Input OMNI : Cruise Phase</AlternateName>
          <ReleaseDate>2017-07-08T16:49:29Z</ReleaseDate>
          <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
@@ -43,7 +43,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>2012-01-01T00:00:00Z</StartDate>
-            <StopDate>2016-09-20T00:00:00Z</StopDate>
+            <StopDate>2016-11-02T22:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Juno/tao-juno-swrt.xml b/NumericalOutput/AMDA/TAO/Juno/tao-juno-swrt.xml
deleted file mode 100644
index 18e2b07..0000000
--- a/NumericalOutput/AMDA/TAO/Juno/tao-juno-swrt.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Spase xmlns="http://www.spase-group.org/data/schema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.spase-group.org/data/schema http://cdpp1.cesr.fr/AMDA-NG/public/schemas/spase-sim-1_0_1.xsd">
-   <Version>2.2.6</Version>
-   <NumericalOutput>
-      <ResourceID>spase://CDPP/NumericalOutput/AMDA/TAO/Juno/tao-juno-swrt</ResourceID>
-      <ResourceHeader>
-         <ResourceName>SW / Input ACE RealTime</ResourceName>
-         <AlternateName>Tao SW Juno /  Input ACE RealTime</AlternateName>
-         <ReleaseDate>2017-07-08T16:49:29Z</ReleaseDate>
-         <Description>ACE RealTime solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
-         <Acknowledgement>TBD</Acknowledgement>
-         <Contact>
-            <PersonID>spase://CDPP/Person/Chihiro.Tao</PersonID>
-            <Role>PrincipalInvestigator</Role>
-         </Contact>
-         <Contact>
-            <PersonID>spase://CDPP/Person/Elena.Budnik</PersonID>
-            <Role>TechnicalContact</Role>
-         </Contact>
-         <InformationURL>
-            <Name>Model Description</Name>
-            <URL>http://www.astro.phys.s.chiba-u.ac.jp/netlab/astro/index2-e.html</URL>
-            <Description/>
-         </InformationURL>
-         <InformationURL>
-            <Name>Model Article</Name>
-            <URL>http://onlinelibrary.wiley.com/doi/10.1029/2004JA010959/abstract</URL>
-          </InformationURL>  
-      </ResourceHeader>
-      <AccessInformation>
-         <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
-         <Availability>Online</Availability>
-         <AccessRights>Open</AccessRights>
-         <AccessURL>
-            <Name>AMDA at CDPP</Name>
-            <URL>http://amda.cdpp.eu</URL>
-         </AccessURL>
-         <Format>Text.ASCII</Format>
-         <Acknowledgement> AMDA is a science analysis system provided by the Centre de Donnees de la Physique des Plasmas (CDPP) supported by CNRS, CNES, Observatoire de Paris and Universite Paul Sabatier, Toulouse</Acknowledgement>
-      </AccessInformation>
-      <SimulationRunID>spase://CDPP/SimulationRun/AMDA/TAO/TaoJuno</SimulationRunID>
-      <MeasurementType>ThermalPlasma</MeasurementType>
-      <TemporalDescription>
-         <TimeSpan>
-            <StartDate>2016-09-05T00:00:00Z</StartDate>
-            <StopDate>2017-02-15T00:00:00Z</StopDate>
-         </TimeSpan>
-         <Cadence>PT1H</Cadence>
-      </TemporalDescription>
-      <SimulatedRegion>Juno</SimulatedRegion>
-      <Caveats>SW Propagation to JUNO is calculated up to 2016-11-02. Use SW Propagation to Jupiter after this date. 
-         
-         Note an important parameter - angle Juno-Sun-Earth - which could be considered as quality flag.</Caveats>
-      <InputResourceID>spase://CDPP/NumericalData/AMDA/ACE/ace-mag-real</InputResourceID>
-      <InputResourceID>spase://CDPP/NumericalData/AMDA/ACE/ace-swepam-real</InputResourceID>
-      <Parameter>
-         <Name>density</Name>
-         <ParameterKey>juno_swrt_n</ParameterKey>
-         <Description>Solar Wind Proton Number Density, scalar</Description>
-         <Units>cm^-3</Units>
-         <FillValue>NaN</FillValue>
-         <Particle>
-            <ParticleType>Proton</ParticleType>
-            <ParticleQuantity>NumberDensity</ParticleQuantity>
-         </Particle>
-      </Parameter>
-      <Parameter>
-         <Name>velocity</Name>
-         <ParameterKey>juno_swrt_v</ParameterKey>
-         <Description>Solar Wind Bulk Speed</Description>
-         <Units>km/s</Units>
-         <Structure>
-            <Size>3</Size>
-            <Element>
-               <Name>V r</Name>
-               <Qualifier>Component.I</Qualifier>
-               <Index>1</Index>
-               <ParameterKey>juno_swrt_v(0)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
-            </Element>
-            <Element>
-               <Name>V t</Name>
-               <Qualifier>Component.J</Qualifier>
-               <Index>2</Index>
-               <ParameterKey>juno_swrt_v(1)</ParameterKey>
-               <ValidMin/>
-               <ValidMax/>
-               <FillValue/>
-            </Element>
-         </Structure>
-         <FillValue>NaN</FillValue>
-         <Particle>
-            <ParticleType>Proton</ParticleType>
-            <ParticleQuantity>Velocity</ParticleQuantity>
-         </Particle>
-      </Parameter>
-      <Parameter>
-         <Name>temperature</Name>
-         <ParameterKey>juno_swrt_t</ParameterKey>
-         <Description/>
-         <Units>eV</Units>
-         <FillValue>NaN</FillValue>
-         <Particle>
-            <ParticleType>Proton</ParticleType>
-            <ParticleQuantity>Temperature</ParticleQuantity>
-         </Particle>
-      </Parameter>
-      <Parameter>
-         <Name>dynamic pressure</Name>
-         <ParameterKey>juno_swrt_pdyn</ParameterKey>
-         <Description/>
-         <Units>nPa</Units>
-         <FillValue>NaN</FillValue>
-         <Particle>
-            <ParticleType>Proton</ParticleType>
-            <ParticleQuantity>Pressure</ParticleQuantity>
-         </Particle>
-      </Parameter>
-      <Parameter>
-         <Name>b tangential</Name>
-         <ParameterKey>juno_swrt_b</ParameterKey>
-         <Description/>
-         <Units>nT</Units>          
-         <FillValue>NaN</FillValue>
-         <Field>
-            <FieldQuantity>Magnetic</FieldQuantity>
-         </Field>
-      </Parameter>
-      <Parameter>
-         <Name>angle Juno-Sun-Earth</Name>
-         <ParameterKey>juno_swrt_da</ParameterKey>
-         <Description/>
-         <Units/>
-         <FillValue>NaN</FillValue>
-         <Support>
-            <SupportQuantity>Positional</SupportQuantity>
-         </Support>
-      </Parameter>
-   </NumericalOutput>
-</Spase>
diff --git a/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-sw.xml b/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-sw.xml
index 407e7ba..f3dd758 100644
--- a/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-sw.xml
+++ b/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-sw.xml
@@ -43,7 +43,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>1990-01-01T01:00:00Z</StartDate>
-            <StopDate>2016-09-20T00:00:00Z</StopDate>
+            <StopDate>2017-01-21T00:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-swrt.xml b/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-swrt.xml
index f1eeade..3ce7d16 100644
--- a/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-swrt.xml
+++ b/NumericalOutput/AMDA/TAO/Jupiter/tao-jup-swrt.xml
@@ -42,8 +42,8 @@
       <MeasurementType>ThermalPlasma</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
-            <StartDate>2016-09-05T00:00:00Z</StartDate>
-            <StopDate>2017-02-17T00:00:00Z</StopDate>
+            <StartDate>2017-01-06T00:00:00Z</StartDate>
+            <StopDate>2017-02-28T00:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Mars/tao-mars-sw.xml b/NumericalOutput/AMDA/TAO/Mars/tao-mars-sw.xml
index bf95aa8..bc006ec 100644
--- a/NumericalOutput/AMDA/TAO/Mars/tao-mars-sw.xml
+++ b/NumericalOutput/AMDA/TAO/Mars/tao-mars-sw.xml
@@ -43,7 +43,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>1990-01-01T01:00:00Z</StartDate>
-            <StopDate>2016-09-20T00:00:00Z</StopDate>
+            <StopDate>2017-01-21T00:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml b/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml
index 3ca02a9..ddac7b7 100644
--- a/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml
+++ b/NumericalOutput/AMDA/TAO/Mars/tao-mars-swrt.xml
@@ -42,8 +42,8 @@
       <MeasurementType>ThermalPlasma</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
-            <StartDate>1990-01-01T01:00:00Z</StartDate>
-            <StopDate>2016-09-20T00:00:00Z</StopDate>
+            <StartDate>2017-01-06T00:00:00Z</StartDate>
+            <StopDate>2017-02-28T00:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Mercury/tao-mercury-sw.xml b/NumericalOutput/AMDA/TAO/Mercury/tao-mercury-sw.xml
index 9a79e1d..49992ec 100644
--- a/NumericalOutput/AMDA/TAO/Mercury/tao-mercury-sw.xml
+++ b/NumericalOutput/AMDA/TAO/Mercury/tao-mercury-sw.xml
@@ -43,7 +43,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>1990-01-01T01:00:00Z</StartDate>
-            <StopDate>2016-09-19T00:00:00Z</StopDate>
+            <StopDate>2017-01-21T00:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Rosetta/tao-ros-sw.xml b/NumericalOutput/AMDA/TAO/Rosetta/tao-ros-sw.xml
index 7181897..57ae204 100644
--- a/NumericalOutput/AMDA/TAO/Rosetta/tao-ros-sw.xml
+++ b/NumericalOutput/AMDA/TAO/Rosetta/tao-ros-sw.xml
@@ -43,7 +43,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>2014-01-01T00:00:00Z</StartDate>
-            <StopDate>2016-07-14T00:00:00Z</StopDate>
+            <StopDate>2017-01-01T00:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Saturn/tao-sat-sw.xml b/NumericalOutput/AMDA/TAO/Saturn/tao-sat-sw.xml
index 7c00808..5fb897a 100644
--- a/NumericalOutput/AMDA/TAO/Saturn/tao-sat-sw.xml
+++ b/NumericalOutput/AMDA/TAO/Saturn/tao-sat-sw.xml
@@ -43,7 +43,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>1990-01-01T01:30:00Z</StartDate>
-            <StopDate>2016-07-14T00:00:00Z</StopDate>
+            <StopDate>2017-01-01T00:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
diff --git a/NumericalOutput/AMDA/TAO/Venus/tao-venus-sw.xml b/NumericalOutput/AMDA/TAO/Venus/tao-venus-sw.xml
index b3534c7..d1ed27a 100644
--- a/NumericalOutput/AMDA/TAO/Venus/tao-venus-sw.xml
+++ b/NumericalOutput/AMDA/TAO/Venus/tao-venus-sw.xml
@@ -43,7 +43,7 @@
       <TemporalDescription>
          <TimeSpan>
             <StartDate>1990-01-01T01:00:00Z</StartDate>
-            <StopDate>2016-09-19T00:00:00Z</StopDate>
+            <StopDate>2017-01-21T00:00:00Z</StopDate>
          </TimeSpan>
          <Cadence>PT1H</Cadence>
       </TemporalDescription>
--
libgit2 0.21.2