diff --git a/NumericalData/AMDA/Juno/Ephemeris/juno-cruise-all.xml b/NumericalData/AMDA/Juno/Ephemeris/juno-cruise-all.xml
index 3a798c3..d17103a 100644
--- a/NumericalData/AMDA/Juno/Ephemeris/juno-cruise-all.xml
+++ b/NumericalData/AMDA/Juno/Ephemeris/juno-cruise-all.xml
@@ -32,21 +32,52 @@
                 http://amda.cdpp.eu
             </URL>
          </AccessURL>
-         <Format/>
+         <Format>Text</Format>
          <Acknowledgement>           
          </Acknowledgement>
       </AccessInformation>
       <ProviderName/> 
       <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/Ephemeris</InstrumentID>
-      <MeasurementType/>
+      <MeasurementType>Ephemeris</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2011-08-05T17:01:07Z</StartDate>
              <StopDate>2016-05-31T22:01:05Z</StopDate>
          </TimeSpan>
-      <Cadence>3600s</Cadence></TemporalDescription>
-      <ObservedRegion/>
+      <Cadence>PT1H</Cadence></TemporalDescription>
+      <ObservedRegion>Heliosphere</ObservedRegion>
       <Caveats>
       </Caveats>    
-<Parameter><Name>xyz_iau_sun</Name><ParameterKey>juno_cruise_xyz</ParameterKey><Description/><Ucd/><Units>AU</Units><UnitsConversion/><Structure><Size>3</Size><Element><Name>x</Name><Qualifier/><Index/><ParameterKey>juno_cruise_xyz(0)</ParameterKey><ValidMin/><ValidMax/><FillValue/></Element><Element><Name>y</Name><Qualifier/><Index/><ParameterKey>juno_cruise_xyz(1)</ParameterKey><ValidMin/><ValidMax/><FillValue/></Element><Element><Name>z</Name><Qualifier/><Index/><ParameterKey>juno_cruise_xyz(2)</ParameterKey><ValidMin/><ValidMax/><FillValue/></Element></Structure></Parameter><Parameter><Name>r_iau_sun</Name><ParameterKey>juno_cruise_r</ParameterKey><Description/><Ucd/><Units>AU</Units><UnitsConversion/></Parameter><Parameter><Name>lon_iau_sun</Name><ParameterKey>juno_cruise_lon</ParameterKey><Description/><Ucd/><Units>deg</Units><UnitsConversion/></Parameter><Parameter><Name>lat_iau_sun</Name><ParameterKey>juno_cruise_lat</ParameterKey><Description/><Ucd/><Units>deg</Units><UnitsConversion/></Parameter></NumericalData>
+<Parameter>
+   <Name>xyz_iau_sun</Name>
+   <ParameterKey>juno_cruise_xyz</ParameterKey><Description/>
+   <Ucd/><Units>AU</Units><UnitsConversion/>
+   <Structure><Size>3</Size><Element><Name>x</Name><Qualifier/>
+      <Index/><ParameterKey>juno_cruise_xyz(0)</ParameterKey>
+      <ValidMin/><ValidMax/><FillValue/></Element>
+      <Element><Name>y</Name><Qualifier/><Index/>
+         <ParameterKey>juno_cruise_xyz(1)</ParameterKey>
+         <ValidMin/><ValidMax/><FillValue/>
+      </Element>
+      <Element><Name>z</Name><Qualifier/>
+         <Index/><ParameterKey>juno_cruise_xyz(2)</ParameterKey>
+         <ValidMin/><ValidMax/><FillValue/>
+      </Element></Structure>
+</Parameter>
+      <Parameter>
+         <Name>distance juno-sun</Name>
+         <ParameterKey>juno_cruise_r</ParameterKey>
+         <Description/><Ucd/><Units>AU</Units><UnitsConversion/>
+      </Parameter>
+      <Parameter>
+         <Name>lon_iau_sun</Name>
+         <ParameterKey>juno_cruise_lon</ParameterKey><Description/>
+         <Ucd/><Units>deg</Units><UnitsConversion/>
+      </Parameter>
+      <Parameter>
+         <Name>lat_iau_sun</Name>
+         <ParameterKey>juno_cruise_lat</ParameterKey>
+         <Description/><Ucd/><Units>deg</Units><UnitsConversion/>
+      </Parameter>
+   </NumericalData>
 </Spase>
diff --git a/NumericalData/AMDA/Juno/Ephemeris/juno-jupiter-all.xml b/NumericalData/AMDA/Juno/Ephemeris/juno-jupiter-all.xml
index 5fa146e..cead39d 100644
--- a/NumericalData/AMDA/Juno/Ephemeris/juno-jupiter-all.xml
+++ b/NumericalData/AMDA/Juno/Ephemeris/juno-jupiter-all.xml
@@ -4,7 +4,7 @@
    <NumericalData>
       <ResourceID>spase://CDPP/NumericalData/AMDA/Juno/ephemeris/juno-jupiter-all</ResourceID>
       <ResourceHeader>
-         <ResourceName>jupiter_flyby</ResourceName>
+         <ResourceName>orbit jupiter</ResourceName>
          <ReleaseDate>2015-10-12T10:48:29Z</ReleaseDate>
          <Description>                        
          </Description>
@@ -32,21 +32,107 @@
                 http://amda.cdpp.eu
             </URL>
          </AccessURL>
-         <Format/>
+         <Format>Text</Format>
          <Acknowledgement>           
          </Acknowledgement>
       </AccessInformation>
       <ProviderName/> 
       <InstrumentID>spase://CDPP/Instrument/AMDA/Juno/Ephemeris</InstrumentID>
-      <MeasurementType/>
+      <MeasurementType>Ephemeris</MeasurementType>
       <TemporalDescription>
          <TimeSpan>
              <StartDate>2016-06-01T00:00:00Z</StartDate>
              <StopDate>2017-10-16T20:00:00Z</StopDate>
          </TimeSpan>
-      <Cadence>3600s</Cadence></TemporalDescription>
-      <ObservedRegion/>
+      <Cadence>PT1H</Cadence></TemporalDescription>
+      <ObservedRegion>Jupiter</ObservedRegion>
       <Caveats>
       </Caveats>    
-<Parameter><Name>xyz_iau_jupiter</Name><ParameterKey>juno_jup_xyz</ParameterKey><Description/><Ucd/><Units>AU</Units><UnitsConversion/><Structure><Size>3</Size><Element><Name>x</Name><Qualifier/><Index/><ParameterKey>juno_jup_xyz(0)</ParameterKey><ValidMin/><ValidMax/><FillValue/></Element><Element><Name>y</Name><Qualifier/><Index/><ParameterKey>juno_jup_xyz(1)</ParameterKey><ValidMin/><ValidMax/><FillValue/></Element><Element><Name>z</Name><Qualifier/><Index/><ParameterKey>juno_jup_xyz(2)</ParameterKey><ValidMin/><ValidMax/><FillValue/></Element></Structure></Parameter><Parameter><Name>r_iau_jupiter</Name><ParameterKey>juno_jup_r</ParameterKey><Description/><Ucd/><Units>AU</Units><UnitsConversion/></Parameter><Parameter><Name>lon_iau_jupiter</Name><ParameterKey>juno_jup_lon</ParameterKey><Description/><Ucd/><Units>deg</Units><UnitsConversion/></Parameter><Parameter><Name>lat_iau_jupiter</Name><ParameterKey>juno_jup_lat</ParameterKey><Description/><Ucd/><Units>deg</Units><UnitsConversion/></Parameter><Parameter><Name>xyz_jsm</Name><ParameterKey>juno_jup_jsm</ParameterKey><Description/><Ucd/><Units>AU</Units><UnitsConversion/><Structure><Size>3</Size><Element><Name>x</Name><Qualifier/><Index/><ParameterKey>juno_jup_jsm(0)</ParameterKey><ValidMin/><ValidMax/><FillValue/></Element><Element><Name>y</Name><Qualifier/><Index/><ParameterKey>juno_jup_jsm(1)</ParameterKey><ValidMin/><ValidMax/><FillValue/></Element><Element><Name>z</Name><Qualifier/><Index/><ParameterKey>juno_jup_jsm(2)</ParameterKey><ValidMin/><ValidMax/><FillValue/></Element></Structure></Parameter><Parameter><Name>xyz_jso</Name><ParameterKey>juno_jup_jso</ParameterKey><Description/><Ucd/><Units>AU</Units><UnitsConversion/><Structure><Size>3</Size><Element><Name>x</Name><Qualifier/><Index/><ParameterKey>juno_jup_js0(0)</ParameterKey><ValidMin/><ValidMax/><FillValue/></Element><Element><Name>y</Name><Qualifier/><Index/><ParameterKey>juno_jup_js0(1)</ParameterKey><ValidMin/><ValidMax/><FillValue/></Element><Element><Name>z</Name><Qualifier/><Index/><ParameterKey>juno_jup_js0(2)</ParameterKey><ValidMin/><ValidMax/><FillValue/></Element></Structure></Parameter></NumericalData>
+<Parameter>
+   <Name>xyz_iau_jupiter</Name>
+   <ParameterKey>juno_jup_xyz</ParameterKey>
+   <Description/><Ucd/><Units>AU</Units><UnitsConversion/>
+   <Structure><Size>3</Size><Element><Name>x</Name><Qualifier/>
+      <Index/><ParameterKey>juno_jup_xyz(0)</ParameterKey>
+      <ValidMin/><ValidMax/><FillValue/>
+   </Element>
+      <Element>
+         <Name>y</Name><Qualifier/><Index/>
+         <ParameterKey>juno_jup_xyz(1)</ParameterKey>
+         <ValidMin/><ValidMax/><FillValue/>
+      </Element>
+      <Element>
+         <Name>z</Name>
+         <Qualifier/><Index/>
+         <ParameterKey>juno_jup_xyz(2)</ParameterKey>
+         <ValidMin/>
+         <ValidMax/>
+         <FillValue/>
+      </Element>
+   </Structure>
+</Parameter>
+      <Parameter><Name>distance juno-jup</Name>
+         <ParameterKey>juno_jup_r</ParameterKey>
+         <Description/><Ucd/>
+         <Units>AU</Units><UnitsConversion/>
+      </Parameter>
+      <Parameter>
+         <Name>lon_iau_jupiter</Name>
+         <ParameterKey>juno_jup_lon</ParameterKey>
+         <Description/>
+         <Ucd/><Units>deg</Units><UnitsConversion/>
+      </Parameter>
+      <Parameter><Name>lat_iau_jupiter</Name>
+         <ParameterKey>juno_jup_lat</ParameterKey>
+         <Description/><Ucd/><Units>deg</Units>
+         <UnitsConversion/>
+      </Parameter>
+      <Parameter>
+         <Name>xyz_jsm</Name><ParameterKey>juno_jup_jsm</ParameterKey>
+         <Description/><Ucd/><Units>Rj</Units>
+         <UnitsConversion/>
+         <Structure><Size>3</Size><Element>
+            <Name>x</Name><Qualifier/><Index/>
+            <ParameterKey>juno_jup_jsm(0)</ParameterKey>
+            <ValidMin/><ValidMax/><FillValue/>
+         </Element>
+            <Element><Name>y</Name><Qualifier/>
+            <Index/><ParameterKey>juno_jup_jsm(1)</ParameterKey>
+            <ValidMin/><ValidMax/>
+            <FillValue/>
+         </Element>
+            <Element><Name>z</Name>
+            <Qualifier/><Index/>
+               <ParameterKey>juno_jup_jsm(2)</ParameterKey>
+               <ValidMin/><ValidMax/><FillValue/>
+            </Element>
+         </Structure>
+      </Parameter>
+      <Parameter>
+         <Name>xyz_jso</Name>
+         <ParameterKey>juno_jup_jso</ParameterKey>
+         <Description/><Ucd/><Units>Rj</Units>
+         <UnitsConversion/><Structure>
+            <Size>3</Size><Element>
+               <Name>x</Name>
+               <Qualifier/>
+               <Index/>
+               <ParameterKey>juno_jup_js0(0)</ParameterKey>
+               <ValidMin/><ValidMax/><FillValue/></Element>
+            <Element>
+               <Name>y</Name>
+               <Qualifier/>
+               <Index/>
+               <ParameterKey>juno_jup_js0(1)</ParameterKey>
+               <ValidMin/><ValidMax/><FillValue/>
+            </Element>
+            <Element>
+               <Name>z</Name>
+               <Qualifier/>
+               <Index/><ParameterKey>juno_jup_js0(2)</ParameterKey>
+               <ValidMin/><ValidMax/><FillValue/>
+            </Element>
+         </Structure>
+      </Parameter>
+   </NumericalData>
 </Spase>
--
libgit2 0.21.2