diff --git a/NumericalData/AMDA/MAVEN/STATIC/mav-static-kp.xml b/NumericalData/AMDA/MAVEN/STATIC/mav-static-kp.xml
index d5465bd..646baa3 100644
--- a/NumericalData/AMDA/MAVEN/STATIC/mav-static-kp.xml
+++ b/NumericalData/AMDA/MAVEN/STATIC/mav-static-kp.xml
@@ -8,7 +8,16 @@
          <AlternateName>SWIA : ions considered as protons : key parameters</AlternateName>
          <ReleaseDate>2017-03-12T10:48:29Z</ReleaseDate>
          <Description>Data follow a 4-second cadence when MAVEN is at an altitude of less than 500 km, otherwise the time cadence is 8 seconds.     
-          The in situ key parameters contain 235 parameters selected by the instrument leads and other MAVEN scientists. These data consist of values derived from L2 data provided by the in situ instruments.</Description>
+          The in situ key parameters contain 235 parameters selected by the instrument leads and other MAVEN scientists. These data consist of values derived from L2 data provided by the in situ instruments.    
+    * H+, O+, O2+ below : density - number density below TBD altitude determined from APID c6 (32 energy x 64 mass) while in Ram or Conic modes
+    * H+, O+, O2+ below : temperature - RAM temperature below TBD altitude determined from APID c6 (32 energy x 64 mass) while in Ram or Conic modes
+    * O2+ below : v_mso - O2+ flow velocity in MSO below TBD altitude determined from APID c8 while in Ram or Conic mode
+    * H+, He++, O+, O2+ above : flux - omni-directional flux above TBD altitude determined from APID c6 while in Pickup, Eclipse and Protect mode
+    * H+, He++, O+, O2+ above : flux energy - omni-directional characteristic energy above TBD altitude determined from APID c6 while in Pickup, Eclipse and Protect mode
+    * H+ above : direction mso - H+ MSO direction of flux above TBD altitude determined from TBD APID while in Pickup and Scan mode
+    * H+ above : die angular width - H+ flux angular width above TBD altitude determined from TBD APID while in Pickup and Scan mode
+    * pickup above : direction mso - Dominant pickup ion MSO direction of flux above TBD altitude determined from APID D0 and CE while in Pickup, Eclipse and Protect mode
+    * pickup above : dir angular width - Dominant pickup ion flux angular width above TBD altitude determined from APID D0 and CE while in Pickup, Eclipse and Protect mode </Description>
          <Acknowledgement>Principal Investigator : James P. McFadden, SSL, Berkeley</Acknowledgement>
           <Contact>        
             <PersonID>spase://SMWG/Person/James.P.McFadden</PersonID>
@@ -53,7 +62,7 @@
       <ObservedRegion>Mars</ObservedRegion>
       <Caveats>Quality flag defines number of counts in the measurement</Caveats>    
       <Parameter>
-         <Name>h+ density</Name>
+         <Name>h+ below : density</Name>
          <ParameterKey>mav_stakp_h_n</ParameterKey>
          <Description>H+ number density below TBD altitude determined from APID c6 (32 energy x 64 mass) while in Ram or Conic modes</Description>
          <Ucd>phys.density;phys.atmol.ionStage</Ucd>
@@ -65,20 +74,102 @@
          </Particle>
       </Parameter> 
       <Parameter>
-         <Name>moments quality</Name>
-         <ParameterKey>mav_stakp_qual</ParameterKey>
-         <Description/>
+         <Name>h+ below : temperature</Name>
+         <ParameterKey>mav_stakp_h_t</ParameterKey>
+         <Description>H+ temperature below TBD altitude determined from APID c6 (32 energy x 64 mass) while in Ram or Conic modes</Description>
          <Ucd/>
-         <Units/>
+         <Units>eV</Units>
+         <UnitsConversion/>
+         <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>Temperature</ParticleQuantity>
+         </Particle>
+      </Parameter> 
+      <Parameter>
+         <Name>h+ below : _temp/dens quality</Name>
+         <ParameterKey>mav_stakp_h_qual_below</ParameterKey>
+         <Description>Number of counts in the measurement </Description>
+         <Ucd/>
+         <Units>Counts</Units>
+         <UnitsConversion/>
+         <Support>
+            <SupportQuantity>Other</SupportQuantity>
+         </Support>
+      </Parameter>
+      <Parameter>
+         <Name>o+ below : density</Name>
+         <ParameterKey>mav_stakp_o_n</ParameterKey>
+         <Description>O+ number density below TBD altitude determined from APID c6 (32 energy x 64 mass) while in Ram or Conic modes</Description>
+         <Ucd>phys.density;phys.atmol.ionStage</Ucd>
+         <Units>cm-3</Units>
+         <UnitsConversion/>
+         <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>NumberDensity</ParticleQuantity>
+         </Particle>
+      </Parameter> 
+       <Parameter>
+         <Name>o+ below : temperature</Name>
+         <ParameterKey>mav_stakp_o_t</ParameterKey>
+         <Description>O+ temperatue below TBD altitude determined from APID c6 (32 energy x 64 mass) while in Ram or Conic modes</Description>
+         <Ucd>phys.density;phys.atmol.ionStage</Ucd>
+         <Units>eV</Units>
+         <UnitsConversion/>
+         <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>Temperature</ParticleQuantity>
+         </Particle>
+      </Parameter> 
+      <Parameter>
+         <Name>o+ below : _temp/dens quality</Name>
+         <ParameterKey>mav_stakp_o_qual_below</ParameterKey>
+         <Description>Number of counts in the measurement </Description>
+         <Ucd/>
+         <Units>Counts</Units>
          <UnitsConversion/>
          <Support>
             <SupportQuantity>Other</SupportQuantity>
          </Support>
       </Parameter>
       <Parameter>
-         <Name>v_mso</Name>
-         <ParameterKey>mav_stakp_vmso</ParameterKey>
-         <Description>Bulk ion flow velocity from SWIA onboard moment calculation, assuming 100% protons</Description>
+         <Name>o2+ below : density</Name>
+         <ParameterKey>mav_stakp_o2_n</ParameterKey>
+         <Description>O2+ number density below TBD altitude determined from APID c6 (32 energy x 64 mass) while in Ram or Conic modes</Description>
+         <Ucd>phys.density;phys.atmol.ionStage</Ucd>
+         <Units>cm-3</Units>
+         <UnitsConversion/>
+         <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>NumberDensity</ParticleQuantity>
+         </Particle>
+      </Parameter> 
+       <Parameter>
+         <Name>o2+ below : temperature</Name>
+         <ParameterKey>mav_stakp_o2_t</ParameterKey>
+         <Description>O2+ temperatue below TBD altitude determined from APID c6 (32 energy x 64 mass) while in Ram or Conic modes</Description>
+         <Ucd>phys.density;phys.atmol.ionStage</Ucd>
+         <Units>eV</Units>
+         <UnitsConversion/>
+         <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>Temperature</ParticleQuantity>
+         </Particle>
+      </Parameter> 
+      <Parameter>
+         <Name>o2+ below : _temp/dens quality</Name>
+         <ParameterKey>mav_stakp_o2_qual_below</ParameterKey>
+         <Description>Number of counts in the measurement</Description>
+         <Ucd/>
+         <Units>Counts</Units>
+         <UnitsConversion/>
+         <Support>
+            <SupportQuantity>Other</SupportQuantity>
+         </Support>
+      </Parameter>
+      <Parameter>
+         <Name>o2+ below : v mso</Name>
+         <ParameterKey>mav_stakp_o2_vmso</ParameterKey>
+         <Description> O2+ MSO  velocity below TBD altitude while in Ram or Conic mode</Description>
          <Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
          <Units>km/s</Units>
          <UnitsConversion/>
@@ -86,26 +177,23 @@
             <Size>3</Size>
             <Element>
                <Name>vx</Name>
-               <Qualifier>Component</Qualifier>
                <Index>1</Index>
-               <ParameterKey>mav_stakp_vmso(0)</ParameterKey>
+               <ParameterKey>mav_stakp_o2_vmso(0)</ParameterKey>
                <ValidMin/>
                <ValidMax/>
                <FillValue/>
             </Element>
             <Element>
                <Name>vy</Name>
-               <Qualifier>Component</Qualifier>
                <Index>2</Index>
-               <ParameterKey>mav_stakp_vmso(1)</ParameterKey>
+               <ParameterKey>mav_stakp_o2_vmso(1)</ParameterKey>
                <ValidMin/>
                <ValidMax/>
                <FillValue/>
             </Element>
             <Element><Name>vz</Name>
-               <Qualifier>Component</Qualifier>
                <Index>3</Index>
-               <ParameterKey>mav_stakp_vmso(2)</ParameterKey>
+               <ParameterKey>mav_stakp_o2_vmso(2)</ParameterKey>
                <ValidMin/>
                <ValidMax/>
                <FillValue/>
@@ -115,30 +203,281 @@
             <ParticleType>Ion</ParticleType>
             <ParticleQuantity>Velocity</ParticleQuantity>
          </Particle>
+      </Parameter>  
+      <Parameter>
+         <Name>o2+ below : v mso quality</Name>
+         <ParameterKey>mav_stakp_o2_qual_vmso</ParameterKey>
+         <Description>Number of counts in the measurement</Description>
+         <Ucd/>
+         <Units>Counts</Units>
+         <UnitsConversion/>
+         <Support>
+            <SupportQuantity>Other</SupportQuantity>
+         </Support>
+      </Parameter> 
+      <Parameter>
+         <Name>h+ above : flux</Name>
+         <ParameterKey>mav_stakp_h_f</ParameterKey>
+         <Description>H+ omni-directional flux above TBD altitude determined from APID c6 while in Pickup, Eclipse and Protect mode</Description>
+         <Ucd/>
+         <Units>1/(cm^2 s)</Units>
+         <UnitsConversion/>
+         <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>NumberFlux</ParticleQuantity>
+         </Particle>
+      </Parameter>  
+      <Parameter>
+         <Name>h+ above : flux energy</Name>
+         <ParameterKey>mav_stakp_h_e</ParameterKey>
+         <Description> H+ omni-directional characteristic energy above TBD altitude determined from APID c6 while in Pickup, Eclipse and Protect mode</Description>
+         <Ucd/>
+         <Units>eV</Units>
+         <UnitsConversion/>
+         <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>Energy</ParticleQuantity>
+         </Particle>
       </Parameter>
-        <Parameter>
-         <Name>|v|</Name>
-         <ParameterKey>mav_stakp_vtot</ParameterKey>
-         <Description>Bulk ion flow velocity magnitude from SWIA onboard moment calculation, assuming 100% protons</Description>
-         <Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
-         <Units>km/s</Units>
-         <UnitsConversion/>         
+      <Parameter>
+         <Name>h+ above : flux quality</Name>
+         <ParameterKey>mav_stakp_h_qual_above</ParameterKey>
+         <Description>Number of counts in the measurement</Description>
+         <Ucd/>
+         <Units>counts</Units>
+         <UnitsConversion/>
+         <Support>
+            <SupportQuantity>Other</SupportQuantity>
+         </Support>
+      </Parameter> 
+      <Parameter>
+         <Name>he++ above : flux</Name>
+         <ParameterKey>mav_stakp_he_f</ParameterKey>
+         <Description>He++ omni-directional flux above TBD altitude determined from APID c6 while in Pickup, Eclipse and Protect mode</Description>
+         <Ucd/>
+         <Units>1/(cm^2 s)</Units>
+         <UnitsConversion/>
          <Particle>
             <ParticleType>Ion</ParticleType>
-            <ParticleQuantity>Velocity</ParticleQuantity>
+            <ParticleQuantity>NumberFlux</ParticleQuantity>
+         </Particle>
+      </Parameter>  
+      <Parameter>
+         <Name>he++ above : flux energy</Name>
+         <ParameterKey>mav_stakp_he_e</ParameterKey>
+         <Description> He++ omni-directional characteristic energy above TBD altitude determined from APID c6 while in Pickup, Eclipse and Protect mode</Description>
+         <Ucd/>
+         <Units>eV</Units>
+         <UnitsConversion/>
+         <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>Energy</ParticleQuantity>
          </Particle>
       </Parameter>
       <Parameter>
-         <Name>temperature</Name>
-         <ParameterKey>mav_stakp_t</ParameterKey>
-         <Description> Scalar ion temperature from SWIA onboard moment calculation, assuming 100% protons</Description>
-         <Ucd>phys.temperature;phys.atmol.Ionstage</Ucd>
+         <Name>he++ above : flux quality</Name>
+         <ParameterKey>mav_stakp_he_qual_above</ParameterKey>
+         <Description>Number of counts in the measurement</Description>
+         <Ucd/>
+         <Units>counts</Units>
+         <UnitsConversion/>
+         <Support>
+            <SupportQuantity>Other</SupportQuantity>
+         </Support>
+      </Parameter> 
+      <Parameter>
+         <Name>o+ above : flux</Name>
+         <ParameterKey>mav_stakp_o_f</ParameterKey>
+         <Description>O+ omni-directional flux above TBD altitude determined from APID c6 while in Pickup, Eclipse and Protect mode</Description>
+         <Ucd/>
+         <Units>1/(cm^2 s)</Units>
+         <UnitsConversion/>
+         <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>NumberFlux</ParticleQuantity>
+         </Particle>
+      </Parameter>  
+      <Parameter>
+         <Name>o+ above : flux energy</Name>
+         <ParameterKey>mav_stakp_o_e</ParameterKey>
+         <Description>O+ omni-directional characteristic energy above TBD altitude determined from APID c6 while in Pickup, Eclipse and Protect mode</Description>
+         <Ucd/>
          <Units>eV</Units>
-        <UnitsConversion/>              
+         <UnitsConversion/>
          <Particle>
             <ParticleType>Ion</ParticleType>
-            <ParticleQuantity>Temperature</ParticleQuantity>
-         </Particle>          
-      </Parameter>               
+            <ParticleQuantity>Energy</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>o+ above : flux quality</Name>
+         <ParameterKey>mav_stakp_o_qual_above</ParameterKey>
+         <Description>Number of counts in the measurement</Description>
+         <Ucd/>
+         <Units>counts</Units>
+         <UnitsConversion/>
+         <Support>
+            <SupportQuantity>Other</SupportQuantity>
+         </Support>
+      </Parameter>  
+      <Parameter>
+         <Name>o2+ above : flux</Name>
+         <ParameterKey>mav_stakp_o2_f</ParameterKey>
+         <Description>O2+ omni-directional flux above TBD altitude determined from APID c6 while in Pickup, Eclipse and Protect mode</Description>
+         <Ucd/>
+         <Units>1/(cm^2 s)</Units>
+         <UnitsConversion/>
+         <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>NumberFlux</ParticleQuantity>
+         </Particle>
+      </Parameter>  
+      <Parameter>
+         <Name>o2+ above : flux energy</Name>
+         <ParameterKey>mav_stakp_o2_e</ParameterKey>
+         <Description>O2+ omni-directional characteristic energy above TBD altitude determined from APID c6 while in Pickup, Eclipse and Protect mode</Description>
+         <Ucd/>
+         <Units>eV</Units>
+         <UnitsConversion/>
+         <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>Energy</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>o2+ above : flux quality</Name>
+         <ParameterKey>mav_stakp_o2_qual_above</ParameterKey>
+         <Description>Number of counts in the measurement</Description>
+         <Ucd/>
+         <Units>counts</Units>
+         <UnitsConversion/>
+         <Support>
+            <SupportQuantity>Other</SupportQuantity>
+         </Support>
+      </Parameter> 
+      <Parameter>
+         <Name>h+ above : direction mso</Name>
+         <ParameterKey>mav_stakp_h_mso</ParameterKey>
+         <Description>H+ MSO direction of flux above TBD altitude determined from TBD APID while in Pickup and Scan mode</Description>
+         <Ucd/>
+         <Units/>
+         <UnitsConversion/>
+         <Structure>
+            <Size>3</Size>
+            <Element>
+               <Name>x</Name>
+               <Index>1</Index>
+               <ParameterKey>mav_stakp_h_mso(0)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+            <Element>
+               <Name>y</Name>
+               <Index>2</Index>
+               <ParameterKey>mav_stakp_h_mso(1)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+            <Element>
+               <Name>z</Name>
+               <Index>3</Index>
+               <ParameterKey>mav_stakp_h_mso(2)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+         </Structure>
+          <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>ArrivalDirection</ParticleQuantity>
+         </Particle>
+      </Parameter> 
+      <Parameter>
+         <Name>h+ above : dir angular width</Name>
+         <ParameterKey>mav_stakp_h_ang</ParameterKey>
+         <Description>H+ flux angular width above TBD altitude determined from TBD APID while in Pickup and Scan mode</Description>
+         <Ucd/>
+         <Units>degrees</Units>
+         <UnitsConversion/>
+         <Particle>
+            <ParticleType>Proton</ParticleType>
+            <ParticleQuantity>ArrivalDirection</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>h+ above : direction quality</Name>
+         <ParameterKey>mav_stakp_h_dir_qual</ParameterKey>
+         <Description>Number of counts in the measurement</Description>
+         <Ucd/>
+         <Units>counts</Units>
+         <UnitsConversion/>
+         <Support>
+            <SupportQuantity>Other</SupportQuantity>
+         </Support>
+      </Parameter>   
+      <Parameter>
+         <Name>pickup above : direction mso</Name>
+         <ParameterKey>mav_stakp_p_mso</ParameterKey>
+         <Description>Dominant pickup ion MSO direction of flux above TBD altitude determined from  APID D0 and CE while in Pickup, Eclipse and Protect mode</Description>
+         <Ucd/>
+         <Units/>
+         <UnitsConversion/>
+         <Structure>
+            <Size>3</Size>
+            <Element>
+               <Name>x</Name>
+               <Index>1</Index>
+               <ParameterKey>mav_stakp_p_mso(0)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+            <Element>
+               <Name>y</Name>
+               <Index>2</Index>
+               <ParameterKey>mav_stakp_p_mso(1)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+            <Element>
+               <Name>z</Name>
+               <Index>3</Index>
+               <ParameterKey>mav_stakp_p_mso(2)</ParameterKey>
+               <ValidMin/>
+               <ValidMax/>
+               <FillValue/>
+            </Element>
+         </Structure>
+          <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>ArrivalDirection</ParticleQuantity>
+         </Particle>
+      </Parameter> 
+      <Parameter>
+         <Name>pickup above : dir angular width</Name>
+         <ParameterKey>mav_stakp_p_ang</ParameterKey>
+         <Description>Dominant pickup ion flux angular width above TBD altitude determined from APID D0 and CE while in Pickup, Eclipse and Protect mode</Description>
+         <Ucd/>
+         <Units>degrees</Units>
+         <UnitsConversion/>
+         <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>ArrivalDirection</ParticleQuantity>
+         </Particle>
+      </Parameter>
+      <Parameter>
+         <Name>pickup above : direction quality</Name>
+         <ParameterKey>mav_stakp_p_dir_qual</ParameterKey>
+         <Description>Number of counts in the measurement</Description>
+         <Ucd/>
+         <Units>counts</Units>
+         <UnitsConversion/>
+         <Support>
+            <SupportQuantity>Other</SupportQuantity>
+         </Support>
+      </Parameter>   
    </NumericalData>
 </Spase>
diff --git a/NumericalData/AMDA/MAVEN/SWIA/mav-swia-kp.xml b/NumericalData/AMDA/MAVEN/SWIA/mav-swia-kp.xml
index 0b29e03..deb5b60 100644
--- a/NumericalData/AMDA/MAVEN/SWIA/mav-swia-kp.xml
+++ b/NumericalData/AMDA/MAVEN/SWIA/mav-swia-kp.xml
@@ -93,7 +93,6 @@ Those wishing to look quantitatively at solar wind temperature should use the SW
             <Size>3</Size>
             <Element>
                <Name>vx</Name>
-               <Qualifier>Component</Qualifier>
                <Index>1</Index>
                <ParameterKey>mav_swiakp_vmso(0)</ParameterKey>
                <ValidMin/>
@@ -102,7 +101,6 @@ Those wishing to look quantitatively at solar wind temperature should use the SW
             </Element>
             <Element>
                <Name>vy</Name>
-               <Qualifier>Component</Qualifier>
                <Index>2</Index>
                <ParameterKey>mav_swiakp_vmso(1)</ParameterKey>
                <ValidMin/>
@@ -110,7 +108,6 @@ Those wishing to look quantitatively at solar wind temperature should use the SW
                <FillValue/>
             </Element>
             <Element><Name>vz</Name>
-               <Qualifier>Component</Qualifier>
                <Index>3</Index>
                <ParameterKey>mav_swiakp_vmso(2)</ParameterKey>
                <ValidMin/>
diff --git a/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml b/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml
index 1b89a25..1c2f489 100644
--- a/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml
+++ b/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e.xml
@@ -5,12 +5,16 @@
         <ResourceID>spase://CDPP/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2e</ResourceID>
         <ResourceHeader>
             <ResourceName>electron full mode</ResourceName>
-            <ReleaseDate>2015-10-13T15:12:00</ReleaseDate>
+            <ReleaseDate>2017-03-13T15:12:00</ReleaseDate>
             <Description/>
-            <Contact>
-                <PersonID>spase://SMWG/Person/Elena.budnik</PersonID>
-                <Role>TechnicalContact</Role>
+            <Contact>       
+                <PersonID>spase://SMWG/Person/Charles.W.Carlson</PersonID>
+                <Role>CoInvestigator</Role>
             </Contact>
+            <Contact>     
+                <PersonID>spase://SMWG/Person/James.P.McFadden</PersonID>
+                <Role>CoInvestigator</Role>
+            </Contact>           
         </ResourceHeader>
         <AccessInformation>
             <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -36,7 +40,7 @@
         <Parameter>
             <Name>density</Name>
             <ParameterKey>tha_n_e</ParameterKey>
-            <Description>Ion Density</Description>
+            <Description>Electron Density</Description>
             <Ucd>phys.density;phys.electron</Ucd>
             <Units>cm-3</Units>
             <RenderingHints>
@@ -63,17 +67,17 @@
                 <Size>3</Size>
                 <Element>
                     <Name>vx</Name>
-                    <Index>0</Index>
+                    <Index>1</Index>
                     <ParameterKey>tha_v_e(0)</ParameterKey>
                 </Element>
                 <Element>
                     <Name>vy</Name>
-                    <Index>1</Index>
+                    <Index>2</Index>
                     <ParameterKey>tha_v_e(1)</ParameterKey>
                 </Element>
                 <Element>
                     <Name>vz</Name>
-                    <Index>2</Index>
+                    <Index>3</Index>
                     <ParameterKey>tha_v_e(2)</ParameterKey>
                 </Element>
             </Structure>
@@ -95,17 +99,17 @@
                 <Size>3</Size>
                 <Element>
                     <Name>t_para</Name>
-                    <Index>0</Index>
+                    <Index>1</Index>
                     <ParameterKey>tha_t_e(2)</ParameterKey>
                 </Element>
                 <Element>
                     <Name>t_perp1</Name>
-                    <Index>1</Index>
+                    <Index>2</Index>
                     <ParameterKey>tha_t_e(0)</ParameterKey>
                 </Element>
                 <Element>
                     <Name>t_perp2</Name>
-                    <Index>2</Index>
+                    <Index>3</Index>
                     <ParameterKey>tha_t_e(1)</ParameterKey>
                 </Element>
             </Structure>
@@ -124,7 +128,7 @@
             </RenderingHints>
             <Particle>
                 <ParticleType>Electron</ParticleType>
-                <ParticleQuantity>Counts</ParticleQuantity>
+                <ParticleQuantity>EnergyFlux</ParticleQuantity>
             </Particle>            
         </Parameter>
     </NumericalData>
diff --git a/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2i.xml b/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2i.xml
index ab673ee..1a2a457 100644
--- a/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2i.xml
+++ b/NumericalData/AMDA/THEMIS/A/ESA/tha-esa-l2i.xml
@@ -6,7 +6,7 @@
     <ResourceHeader>
         <ResourceName>ion full mode</ResourceName>
         <ReleaseDate>2017-03-13T15:42:30</ReleaseDate>
-        <Description>"Full Mode" are a low-time-resolution data product useful for large-scale surveys of THEMIS data. They generally maintain the "full" 32 energies sampled, and have an 88 solid-angle map. Full distribution data are 1-spin snapshots of tha plasma with a measurement cadence of either 32 spins (in "Fast-Survey Spacecraft Mode") or 128 spins ("Slow-Survey Spacecraft Mode").</Description>
+        <Description>"Full Mode" is a low-time-resolution data product useful for large-scale surveys of THEMIS data. It generally maintains the "full" 32 energies sampled, and have an 88 solid-angle map. Full distribution data are 1-spin snapshots of the plasma with a measurement cadence of either 32 spins (in "Fast-Survey Spacecraft Mode") or 128 spins ("Slow-Survey Spacecraft Mode").</Description>
           <Contact>       
         <PersonID>spase://SMWG/Person/Charles.W.Carlson</PersonID>
         <Role>CoInvestigator</Role>
@@ -26,13 +26,13 @@
         </AccessURL>
         <Format>NetCDF</Format>
     </AccessInformation>
-    <ProviderName>IRAP_thaMIS</ProviderName>  
+    <ProviderName>IRAP_THEMIS</ProviderName>  
     <InstrumentID>spase://CDPP/Instrument/AMDA/THEMIS/A/ESA</InstrumentID>
     <MeasurementType>ThermalPlasma</MeasurementType>
     <TemporalDescription>
         <TimeSpan>
-            <StartDate>2007-03-07T19:54:48Z</StartDate>
-            <StopDate>2013-05-14T07:45:56Z</StopDate>                
+            <StartDate>2007-03-07T18:53:59Z</StartDate>
+            <StopDate>2014-11-22T04:54:07Z</StopDate>                
         </TimeSpan>
         <Cadence>PT96.27S</Cadence>
     </TemporalDescription>
diff --git a/NumericalData/AMDA/THEMIS/A/ESA/tha-peem-all.xml b/NumericalData/AMDA/THEMIS/A/ESA/tha-peem-all.xml
index 33b3dbc..efa2f29 100644
--- a/NumericalData/AMDA/THEMIS/A/ESA/tha-peem-all.xml
+++ b/NumericalData/AMDA/THEMIS/A/ESA/tha-peem-all.xml
@@ -27,8 +27,8 @@
         <MeasurementType>ThermalPlasma</MeasurementType>
         <TemporalDescription>
             <TimeSpan>
-                <StartDate>2007-08-02T00:00:30Z</StartDate>
-                <StopDate>2014-11-22T04:54:50Z</StopDate>                
+                <StartDate>1970-01-01T00:00:00Z</StartDate>
+                <StopDate>1970-01-01T00:00:00Z</StopDate>                
             </TimeSpan>
             <Cadence>PT3S</Cadence>
         </TemporalDescription> 
diff --git a/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2i.xml b/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2i.xml
index 5a2974c..ff0f8cc 100644
--- a/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2i.xml
+++ b/NumericalData/AMDA/THEMIS/B/ESA/thb-esa-l2i.xml
@@ -6,7 +6,7 @@
     <ResourceHeader>
         <ResourceName>ion full mode</ResourceName>
         <ReleaseDate>2015-10-13T15:42:30</ReleaseDate>
-        <Description>"Full Mode" are a low-time-resolution data product useful for large-scale surveys of THEMIS data. They generally maintain the "full" 32 energies sampled, and have an 88 solid-angle map. Full distribution data are 1-spin snapshots of the plasma with a measurement cadence of either 32 spins (in "Fast-Survey Spacecraft Mode") or 128 spins ("Slow-Survey Spacecraft Mode").&gt;</Description>
+        <Description>"Full Mode" is a low-time-resolution data product useful for large-scale surveys of THEMIS data. It generally maintains the "full" 32 energies sampled, and have an 88 solid-angle map. Full distribution data are 1-spin snapshots of the plasma with a measurement cadence of either 32 spins (in "Fast-Survey Spacecraft Mode") or 128 spins ("Slow-Survey Spacecraft Mode").&gt;</Description>
           <Contact>       
         <PersonID>spase://SMWG/Person/Charles.W.Carlson</PersonID>
         <Role>CoInvestigator</Role>
diff --git a/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2i.xml b/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2i.xml
index 2b5d411..0f1d804 100644
--- a/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2i.xml
+++ b/NumericalData/AMDA/THEMIS/C/ESA/thc-esa-l2i.xml
@@ -1 +1,149 @@
-<?xml version="1.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-amda-1_2_0.xsd">
+    <Version>2.2.6</Version>
+  <NumericalData>
+    <ResourceID>spase://CDPP/NumericalData/AMDA/thaMIS/C/ESA/thc-esa-l2i</ResourceID>
+    <ResourceHeader>
+        <ResourceName>ion full mode</ResourceName>
+        <ReleaseDate>2017-03-13T15:42:30</ReleaseDate>
+        <Description>"Full Mode" is a low-time-resolution data product useful for large-scale surveys of THEMIS data. It generally maintains the "full" 32 energies sampled, and have an 88 solid-angle map. Full distribution data are 1-spin snapshots of the plasma with a measurement cadence of either 32 spins (in "Fast-Survey Spacecraft Mode") or 128 spins ("Slow-Survey Spacecraft Mode").</Description>
+          <Contact>       
+        <PersonID>spase://SMWG/Person/Charles.W.Carlson</PersonID>
+        <Role>CoInvestigator</Role>
+      </Contact>
+      <Contact>     
+        <PersonID>spase://SMWG/Person/James.P.McFadden</PersonID>
+        <Role>CoInvestigator</Role>
+      </Contact>
+    </ResourceHeader>
+    <AccessInformation>
+        <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
+        <Availability>Online</Availability>
+        <AccessRights>Open</AccessRights>
+        <AccessURL>
+            <Name>AMDA</Name>
+            <URL>amda.cdpp.eu</URL>
+        </AccessURL>
+        <Format>NetCDF</Format>
+    </AccessInformation>
+    <ProviderName>IRAP_THEMIS</ProviderName>  
+    <InstrumentID>spase://CDPP/Instrument/AMDA/THEMIS/C/ESA</InstrumentID>
+    <MeasurementType>ThermalPlasma</MeasurementType>
+    <TemporalDescription>
+        <TimeSpan>
+            <StartDate>2007-03-07T15:58:39Z</StartDate>
+            <StopDate>2014-11-23T17:44:22Z</StopDate>                
+        </TimeSpan>
+        <Cadence>PT96.27S</Cadence>
+    </TemporalDescription>
+    <ObservedRegion>Earth.Magnetosphere</ObservedRegion>
+    <Parameter>
+        <Name>density</Name>
+        <ParameterKey>thc_n_i</ParameterKey>
+        <Description>Ion Density</Description>
+        <Ucd>phys.density;phys.atmol.ionStage</Ucd>
+        <Units>cm-3</Units>
+        <RenderingHints>
+            <DisplayType>TimeSeries</DisplayType>
+        </RenderingHints>
+        <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>NumberDensity</ParticleQuantity>
+        </Particle>
+    </Parameter>
+    <Parameter>
+        <Name>v_gse</Name>
+        <ParameterKey>thc_v_i</ParameterKey>
+        <Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
+        <Units>km/s</Units>
+        <CoordinateSystem>
+            <CoordinateRepresentation>Cartesian</CoordinateRepresentation>
+            <CoordinateSystemName>GSE</CoordinateSystemName>
+        </CoordinateSystem>
+        <RenderingHints>
+            <DisplayType>TimeSeries</DisplayType>
+        </RenderingHints>
+        <Structure>
+            <Size>3</Size>
+            <Element>
+                <Name>vx</Name>
+                <Index>1</Index>
+                <ParameterKey>thc_v_i(0)</ParameterKey>
+            </Element>
+            <Element>
+                <Name>vy</Name>
+                <Index>2</Index>
+                <ParameterKey>thc_v_i(1)</ParameterKey>
+            </Element>
+            <Element>
+                <Name>vz</Name>
+                <Index>3</Index>
+                <ParameterKey>thc_v_i(2)</ParameterKey>
+            </Element>
+        </Structure>
+        <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>Velocity</ParticleQuantity>
+        </Particle>
+    </Parameter>
+    <Parameter>
+        <Name>|v|</Name>
+        <ParameterKey>thc_v_i_tot</ParameterKey>
+        <Description>Module of Velocity</Description>
+        <Ucd>phys.veloc;phys.atmol.ionStage</Ucd>
+        <Units>km/s</Units>
+        <RenderingHints>
+            <DisplayType>TimeSeries</DisplayType>
+        </RenderingHints>
+        <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>Velocity</ParticleQuantity>
+        </Particle>
+    </Parameter>
+    <Parameter>
+        <Name>temperature</Name>
+        <ParameterKey>thc_t_i</ParameterKey>
+        <Description>Temperature</Description>
+        <Ucd>phys.temperature;phys.atmol.ionStage</Ucd>
+        <Units>eV</Units>
+        <RenderingHints>
+            <DisplayType>TimeSeries</DisplayType>
+        </RenderingHints>
+        <Structure>
+            <Size>3</Size>
+            <Element>
+                <Name>t_para</Name>
+                <Index>1</Index>
+                <ParameterKey>thc_t_i(2)</ParameterKey>
+            </Element>
+            <Element>
+                <Name>t_perp1</Name>
+                <Index>2</Index>
+                <ParameterKey>thc_t_i(0)</ParameterKey>
+            </Element>
+            <Element>
+                <Name>t_perp2</Name>
+                <Index>3</Index>
+                <ParameterKey>thc_t_i(1)</ParameterKey>
+            </Element>
+        </Structure>
+        <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>Temperature</ParticleQuantity>
+        </Particle>
+    </Parameter>
+    <Parameter>
+        <Name>spectra</Name>
+        <ParameterKey>thc_ion_sp</ParameterKey>
+        <Ucd>phys.flux.density;phys.energy;phys.atmol.ionStage</Ucd>
+        <Units>eV/(cm^2-s-sr-eV)</Units>
+        <RenderingHints>
+            <DisplayType>Spectrogram</DisplayType>
+        </RenderingHints>
+        <Particle>
+            <ParticleType>Ion</ParticleType>
+            <ParticleQuantity>EnergyFlux</ParticleQuantity>
+        </Particle>            
+    </Parameter>
+  </NumericalData>
+</Spase>
diff --git a/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2i.xml b/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2i.xml
index e6c5953..1790caf 100644
--- a/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2i.xml
+++ b/NumericalData/AMDA/THEMIS/D/ESA/thd-esa-l2i.xml
@@ -6,7 +6,7 @@
     <ResourceHeader>
         <ResourceName>ion full mode</ResourceName>
         <ReleaseDate>2017-03-13T15:42:30</ReleaseDate>
-        <Description>"Full Mode" are a low-time-resolution data product useful for large-scale surveys of THEMIS data. They generally maintain the "full" 32 energies sampled, and have an 88 solid-angle map. Full distribution data are 1-spin snapshots of the plasma with a measurement cadence of either 32 spins (in "Fast-Survey Spacecraft Mode") or 128 spins ("Slow-Survey Spacecraft Mode").</Description>
+        <Description>"Full Mode" is a low-time-resolution data product useful for large-scale surveys of THEMIS data. It generally maintains the "full" 32 energies sampled, and have an 88 solid-angle map. Full distribution data are 1-spin snapshots of the plasma with a measurement cadence of either 32 spins (in "Fast-Survey Spacecraft Mode") or 128 spins ("Slow-Survey Spacecraft Mode").</Description>
          <Contact>       
         <PersonID>spase://SMWG/Person/Charles.W.Carlson</PersonID>
         <Role>CoInvestigator</Role>
diff --git a/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2i.xml b/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2i.xml
index 54132ad..a36a0da 100644
--- a/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2i.xml
+++ b/NumericalData/AMDA/THEMIS/E/ESA/the-esa-l2i.xml
@@ -6,7 +6,7 @@
     <ResourceHeader>
         <ResourceName>ion full mode</ResourceName>
         <ReleaseDate>2017-03-13T15:42:30</ReleaseDate>
-        <Description>"Full Mode" are a low-time-resolution data product useful for large-scale surveys of THEMIS data. They generally maintain the "full" 32 energies sampled, and have an 88 solid-angle map. Full distribution data are 1-spin snapshots of the plasma with a measurement cadence of either 32 spins (in "Fast-Survey Spacecraft Mode") or 128 spins ("Slow-Survey Spacecraft Mode").</Description>
+        <Description>"Full Mode" is a low-time-resolution data product useful for large-scale surveys of THEMIS data. It generally maintains the "full" 32 energies sampled, and have an 88 solid-angle map. Full distribution data are 1-spin snapshots of the plasma with a measurement cadence of either 32 spins (in "Fast-Survey Spacecraft Mode") or 128 spins ("Slow-Survey Spacecraft Mode").</Description>
           <Contact>       
         <PersonID>spase://SMWG/Person/Charles.W.Carlson</PersonID>
         <Role>CoInvestigator</Role>
--
libgit2 0.21.2