diff --git a/Data/AmsatList.xml b/Data/AmsatList.xml
index b7801af2874eb9fb743bad0c6b6688e7e2190c28..8d1a728adc33765ba9fbd41d4640f182864d7322 100644
--- a/Data/AmsatList.xml
+++ b/Data/AmsatList.xml
@@ -3,7 +3,7 @@
     <Satellites>
         <Name>UiTMSat-1</Name>
         <Status>Operational</Status>
-        <NasaID>-201808103</NasaID>
+        <NasaID>43589</NasaID>
         <OSCARNumber> </OSCARNumber>
         <UpdateDate>2018-08-015</UpdateDate>
         <LaunchData>
@@ -17,6 +17,11 @@
 		<Description lang="EN">The second BIRDS Project, BIRDS-2, started in November, 2016. The participating countries are Bhutan, Malaysia, Philippines and Japan. 11 students will develop 3 identical 1U CubeSats which will have capability to perform same missions. The bus system for BIRDS-2 takes heritage from BIRDS-1 bus system and incorporates the lessons learned from BIRDS-1.
 		</Description>
 	</Information>
+        <Information>
+			<Title>IARU</Title>
+			<Value> http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=563 </Value>
+		<Description lang="EN"> </Description>
+	</Information>
         <RadioData>
             <Beacons>
                 <Name>Main</Name>
@@ -51,7 +56,7 @@
     <Satellites>
         <Name>MAYA-1</Name>
         <Status>Operational</Status>
-        <NasaID>-201808102</NasaID>
+        <NasaID>43590</NasaID>
         <OSCARNumber> </OSCARNumber>
         <UpdateDate>2018-08-015</UpdateDate>
         <LaunchData>
@@ -65,6 +70,11 @@
 		<Description lang="EN">The second BIRDS Project, BIRDS-2, started in November, 2016. The participating countries are Bhutan, Malaysia, Philippines and Japan. 11 students will develop 3 identical 1U CubeSats which will have capability to perform same missions. The bus system for BIRDS-2 takes heritage from BIRDS-1 bus system and incorporates the lessons learned from BIRDS-1.
 		</Description>
 	</Information>
+        <Information>
+			<Title>IARU</Title>
+			<Value> http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=564 </Value>
+		<Description lang="EN"> </Description>
+	</Information>
         <RadioData>
             <Beacons>
                 <Name>Main</Name>
@@ -148,9 +158,9 @@
         </TelemetryData>
     </Satellites>
     <Satellites>
-        <Name>SIRIUSSAT-2C</Name>
+        <Name>SIRIUSSAT-2 (SXC1-182)</Name>
         <Status>Operational</Status>
-        <NasaID>-201808152</NasaID>
+        <NasaID>43596 </NasaID>
         <OSCARNumber> </OSCARNumber>
         <UpdateDate>2018-08-015</UpdateDate>
         <LaunchData>
@@ -201,7 +211,7 @@
     <Satellites>
         <Name>BHUTAN-1</Name>
         <Status>Operational</Status>
-        <NasaID>-20180801</NasaID>
+        <NasaID>43591</NasaID>
         <OSCARNumber></OSCARNumber>
         <UpdateDate>2018-08-015</UpdateDate>
         <LaunchData>
@@ -215,6 +225,11 @@
 		<Description lang="EN">The second BIRDS Project, BIRDS-2, started in November, 2016. The participating countries are Bhutan, Malaysia, Philippines and Japan. 11 students will develop 3 identical 1U CubeSats which will have capability to perform same missions. The bus system for BIRDS-2 takes heritage from BIRDS-1 bus system and incorporates the lessons learned from BIRDS-1.
 		</Description>
 	</Information>
+        <Information>
+			<Title>IARU</Title>
+			<Value> http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=562 </Value>
+		<Description lang="EN"> </Description>
+	</Information>
         <RadioData>
             <Beacons>
                 <Name>Main</Name>
@@ -5248,17 +5263,23 @@
     </Satellites>
     <Satellites>
         <Name>ParkinsonSAT (PSAT)</Name>
-        <NasaID>-33</NasaID>
-        <UpdateDate>2015-06-05</UpdateDate>
-        <SatelliteInformationStatus>Draft</SatelliteInformationStatus>
+        <NasaID>40654 </NasaID>
+        <UpdateDate>2018-11-16</UpdateDate>
+        <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
+        <OSCARNumber> NO84</OSCARNumber>
+        <LaunchData>
+            <LaunchDate>2015-05-20 </LaunchDate>
+            <LaunchingSite> AIR FORCE EASTERN TEST RANGE (AFETR)  </LaunchingSite>
+        </LaunchData>
         <RadioData>
             <Beacons>
-                <Name>APRS</Name>
+                <Name>APRS-AX25</Name>
                 <Frequency>145825000</Frequency>
                 <Modes>
-                    <Mode>AX25</Mode>
+                    <Mode>AFSK</Mode>
                     <Speed>1200</Speed>
                 </Modes>
+                <CallSign>W3ADO-5</CallSign>
             </Beacons>
             <Beacons>
                 <Name>PSK31</Name>
@@ -5298,7 +5319,7 @@
         <UpdateDate>2018-11-04</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> </LaunchingSite>
         </LaunchData>
         <OSCARNumber> </OSCARNumber>
@@ -5355,7 +5376,7 @@
         <UpdateDate>2018-11-04</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
         <OSCARNumber> </OSCARNumber>
@@ -5396,12 +5417,12 @@
         </RadioData>
         <TelemetryData>
             <DescriptionURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </DescriptionURL>
             <ReportURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </ReportURL>
             <ReportEmail></ReportEmail>
             <SoftwareURL/>
@@ -5415,7 +5436,7 @@
         <UpdateDate>2018-11-04</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
         <OSCARNumber> </OSCARNumber>
@@ -5474,7 +5495,7 @@
         <UpdateDate>2018-11-04</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
         <OSCARNumber> </OSCARNumber>
@@ -5541,7 +5562,7 @@
         <UpdateDate>2018-11-04</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
         <OSCARNumber> </OSCARNumber>
@@ -5589,7 +5610,7 @@
         <UpdateDate>2018-11-04</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
         <OSCARNumber> </OSCARNumber>
@@ -5607,7 +5628,7 @@
                     <Mode> BPSK </Mode>
                     <Speed> 9600</Speed>
                 </Modes>
-                <CallSign> </CallSign>
+                <CallSign></CallSign>
             </Beacons>
             <Beacons>
                 <Name>Telemetry 2 </Name>
@@ -5616,17 +5637,17 @@
                     <Mode> DQPSK  </Mode>
                     <Speed> 1.06Mbit/s</Speed>
                 </Modes>
-                <CallSign> </CallSign>
+                <CallSign></CallSign>
             </Beacons>
         </RadioData>
         <TelemetryData>
             <DescriptionURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </DescriptionURL>
             <ReportURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </ReportURL>
             <ReportEmail></ReportEmail>
             <SoftwareURL/>
@@ -5640,7 +5661,7 @@
         <UpdateDate>2018-11-04</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
         <OSCARNumber> </OSCARNumber>
@@ -5685,12 +5706,12 @@
         </RadioData>
         <TelemetryData>
             <DescriptionURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </DescriptionURL>
             <ReportURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </ReportURL>
             <ReportEmail></ReportEmail>
             <SoftwareURL/>
@@ -5704,7 +5725,7 @@
         <UpdateDate>2018-11-04</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
         <OSCARNumber> </OSCARNumber>
@@ -5723,7 +5744,7 @@
         <RadioData>
             <Beacons>
                 <Name>Telemetry 1 </Name>
-                <Frequency>  435275000</Frequency>
+                <Frequency>435275000</Frequency>
                 <Modes>
                     <Mode> BPSK </Mode>
                     <Speed> 9600</Speed>
@@ -5741,8 +5762,8 @@
                 <Value> https://pw-sat.pl/en/information-for-radio-amateurs/</Value>
             </DescriptionURL>
             <ReportURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </ReportURL>
             <ReportEmail></ReportEmail>
             <SoftwareURL>https://radio.pw-sat.pl/communication/desktopsoftware</SoftwareURL>
@@ -5756,10 +5777,10 @@
         <UpdateDate>2018-11-04</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
-        <OSCARNumber> </OSCARNumber>
+        <OSCARNumber></OSCARNumber>
         <Information>
 			<Title>IARU Coordination</Title>
 			<Value>http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=529</Value>
@@ -5774,20 +5795,20 @@
                     <Mode>  GMSK </Mode>
                     <Speed> 9600</Speed>
                 </Modes>
-                <CallSign> </CallSign>
+                <CallSign></CallSign>
             </Beacons>
         </RadioData>
         <TelemetryData>
             <DescriptionURL>
-                <Title>  </Title>
-                <Value>  </Value>
+                <Title></Title>
+                <Value></Value>
             </DescriptionURL>
             <ReportURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </ReportURL>
             <ReportEmail></ReportEmail>
-            <SoftwareURL> </SoftwareURL>
+            <SoftwareURL/>
             <Description></Description>
         </TelemetryData>
     </Satellites>
@@ -5798,7 +5819,7 @@
         <UpdateDate>2018-11-04</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
         <OSCARNumber> </OSCARNumber>
@@ -5825,11 +5846,11 @@
                 <Value> http://control.kau.ac.kr/visioncube/visioncube-2/ </Value>
             </DescriptionURL>
             <ReportURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </ReportURL>
             <ReportEmail>heokjune1994@gmail.com</ReportEmail>
-            <SoftwareURL> </SoftwareURL>
+            <SoftwareURL/>
             <Description></Description>
         </TelemetryData>
     </Satellites>
@@ -5840,7 +5861,7 @@
         <UpdateDate>2018-11-04</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
         <OSCARNumber> </OSCARNumber>
@@ -5875,15 +5896,15 @@
         </RadioData>
         <TelemetryData>
             <DescriptionURL>
-                <Title>   n</Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </DescriptionURL>
             <ReportURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </ReportURL>
-            <ReportEmail> </ReportEmail>
-            <SoftwareURL> </SoftwareURL>
+            <ReportEmail></ReportEmail>
+            <SoftwareURL/>
             <Description></Description>
         </TelemetryData>
     </Satellites>
@@ -5894,7 +5915,7 @@
         <UpdateDate>2018-11-04</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
         <OSCARNumber> </OSCARNumber>
@@ -5929,15 +5950,15 @@
         </RadioData>
         <TelemetryData>
             <DescriptionURL>
-                <Title>   n</Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </DescriptionURL>
             <ReportURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </ReportURL>
-            <ReportEmail> </ReportEmail>
-            <SoftwareURL> </SoftwareURL>
+            <ReportEmail></ReportEmail>
+            <SoftwareURL/>
             <Description></Description>
         </TelemetryData>
     </Satellites>
@@ -5948,7 +5969,7 @@
         <UpdateDate>2018-10-29</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
         <OSCARNumber> </OSCARNumber>
@@ -5992,10 +6013,10 @@
         <UpdateDate>2018-10-29</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
-        <OSCARNumber> </OSCARNumber>
+        <OSCARNumber></OSCARNumber>
         <Information>
 			<Title>project </Title>
 			<Value>https://www.amsat.org/fox-1cliff-ready-for-launch/</Value>
@@ -6009,6 +6030,26 @@
 			<Description lang="FR">Fox-1Cliff a été coordonné par l'IARU </Description>
 		</Information>
         <RadioData>
+            <Beacons>
+                <Name>Telemetry 1 </Name>
+                <Frequency>145920000</Frequency>
+                <Modes>
+                    <Mode>  FSK  </Mode>
+                    <Speed> </Speed>
+                </Modes>
+                <CallSign> </CallSign>
+            </Beacons>
+            <Transponders>
+                <Name>FM voice repeater mode 1</Name>
+                <FrequencyUplink>
+                    <FrequencyBegin>435300000</FrequencyBegin>
+                </FrequencyUplink>
+                <FrequencyDownlink>
+                    <FrequencyBegin>145920000</FrequencyBegin>
+                </FrequencyDownlink>
+                <Mode>FM</Mode>
+                <Tone>67</Tone>
+            </Transponders>
             <Transponders>
                 <Name>FM voice repeater  Mode 2 </Name>
                 <FrequencyUplink>
@@ -6023,12 +6064,12 @@
         </RadioData>
         <TelemetryData>
             <DescriptionURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title>Telemesure software :  FOXTelem </Title>
+                <Value>https://www.amsat.org/foxtelem-software-for-windows-mac-linux/ </Value>
             </DescriptionURL>
             <ReportURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </ReportURL>
             <ReportEmail></ReportEmail>
             <SoftwareURL>https://www.amsat.org/foxtelem-software-for-windows-mac-linux/</SoftwareURL>
@@ -6045,7 +6086,7 @@
             <LaunchDate></LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
-        <OSCARNumber> </OSCARNumber>
+        <OSCARNumber></OSCARNumber>
         <Information>
 			<Title>Project </Title>
 			<Value>https://www.irvinecubesat.org/irvine02</Value>
@@ -6066,20 +6107,20 @@
                     <Mode>  FSK  </Mode>
                     <Speed> 9600</Speed>
                 </Modes>
-                <CallSign> </CallSign>
+                <CallSign></CallSign>
             </Beacons>
         </RadioData>
         <TelemetryData>
             <DescriptionURL>
-                <Title>  </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </DescriptionURL>
             <ReportURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </ReportURL>
-            <ReportEmail> </ReportEmail>
-            <SoftwareURL> </SoftwareURL>
+            <ReportEmail></ReportEmail>
+            <SoftwareURL/>
             <Description></Description>
         </TelemetryData>
     </Satellites>
@@ -6087,13 +6128,18 @@
         <Name>JY1SAT</Name>
         <Status>To be launched</Status>
         <NasaID>0</NasaID>
-        <UpdateDate>2018-10-29</UpdateDate>
+        <UpdateDate>2018-11-16</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
             <LaunchDate></LaunchDate>
-            <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
+            <LaunchingSite>PSLV</LaunchingSite>
         </LaunchData>
-        <OSCARNumber> </OSCARNumber>
+        <OSCARNumber></OSCARNumber>
+        <Information>
+			<Title>JY1SAT launch information and Dashboard</Title>
+			<Value> https://funcube.org.uk/2018/11/15/jy1sat/ </Value>
+
+		</Information>
         <Information>
 			<Title>IARU Coordination</Title>
 			<Value>http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=554 </Value>
@@ -6105,30 +6151,40 @@
                 <Name>FUNcube telemetry </Name>
                 <Frequency>145840000</Frequency>
                 <Modes>
-                    <Mode>  BPSK / SSDV  </Mode>
-                    <Speed> 9600</Speed>
+                    <Mode>  BPSK  </Mode>
+                    <Speed> 1200</Speed>
                 </Modes>
-                <CallSign> </CallSign>
+                <Modes>
+                    <Mode>   SSDV  </Mode>
+                    <Speed> </Speed>
+                </Modes>
+                <CallSign>JY1</CallSign>
             </Beacons>
             <Transponders>
                 <Name>Main</Name>
-                <FrequencyUplink/>
-                <FrequencyDownlink/>
+                <FrequencyUplink>
+                    <FrequencyBegin>435100000</FrequencyBegin>
+                    <FrequencyEnd>435120000</FrequencyEnd>
+                </FrequencyUplink>
+                <FrequencyDownlink>
+                    <FrequencyBegin>145875000</FrequencyBegin>
+                    <FrequencyEnd>145855000</FrequencyEnd>
+                </FrequencyDownlink>
                 <Mode>SSB/CW</Mode>
                 <Inverted>yes</Inverted>
             </Transponders>
         </RadioData>
         <TelemetryData>
             <DescriptionURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title> Telemetry dashboard </Title>
+                <Value> http://data2.amsat-uk.org/ui/jy1sat-fm</Value>
             </DescriptionURL>
             <ReportURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </ReportURL>
-            <ReportEmail></ReportEmail>
-            <SoftwareURL> </SoftwareURL>
+            <ReportEmail>operations@funcube.org.uk</ReportEmail>
+            <SoftwareURL>https://download.funcube.org.uk/JY11Sat_Dashboard_v1160.msi </SoftwareURL>
             <Description></Description>
         </TelemetryData>
     </Satellites>
@@ -6136,13 +6192,17 @@
         <Name>Knacksat</Name>
         <Status>To be launched</Status>
         <NasaID>0</NasaID>
-        <UpdateDate>2018-10-29</UpdateDate>
+        <UpdateDate>2018-11-16</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
         <OSCARNumber> </OSCARNumber>
+        <Information>
+			<Title> project pages </Title>
+			<Value> http://www.knacksat.space</Value>
+		</Information>
         <Information>
 			<Title>IARU Coordination</Title>
 			<Value>http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=520</Value>
@@ -6153,6 +6213,10 @@
             <Beacons>
                 <Name>FUNcube telemetry </Name>
                 <Frequency>435635000</Frequency>
+                <Modes>
+                    <Mode>  CW  </Mode>
+                    <Speed> </Speed>
+                </Modes>
                 <Modes>
                     <Mode>  GFSK  </Mode>
                     <Speed> 9600</Speed>
@@ -6161,7 +6225,7 @@
                     <Mode>  GFSK  </Mode>
                     <Speed> 1200</Speed>
                 </Modes>
-                <CallSign> </CallSign>
+                <CallSign>HS0K</CallSign>
             </Beacons>
         </RadioData>
         <TelemetryData>
@@ -6173,7 +6237,7 @@
                 <Title> </Title>
                 <Value> </Value>
             </ReportURL>
-            <ReportEmail></ReportEmail>
+            <ReportEmail> knacksat@gmail.com</ReportEmail>
             <SoftwareURL> </SoftwareURL>
             <Description></Description>
         </TelemetryData>
@@ -6185,7 +6249,7 @@
         <UpdateDate>2018-10-29</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
         <OSCARNumber> </OSCARNumber>
@@ -6227,11 +6291,11 @@
                 <Value> https://www.move2space.de/MOVE-II/radio-amateurs/ </Value>
             </DescriptionURL>
             <ReportURL>
-                <Title> </Title>
-                <Value> </Value>
+                <Title></Title>
+                <Value></Value>
             </ReportURL>
-            <ReportEmail> </ReportEmail>
-            <SoftwareURL> </SoftwareURL>
+            <ReportEmail></ReportEmail>
+            <SoftwareURL/>
             <Description></Description>
         </TelemetryData>
     </Satellites>
@@ -6242,7 +6306,7 @@
         <UpdateDate>2018-10-29</UpdateDate>
         <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
         <LaunchData>
-            <LaunchDate></LaunchDate>
+            <LaunchDate> </LaunchDate>
             <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
         </LaunchData>
         <OSCARNumber> </OSCARNumber>
@@ -6263,8 +6327,8 @@
                 <Name>Telemetry 1 </Name>
                 <Frequency>	437775000</Frequency>
                 <Modes>
-                    <Mode>     </Mode>
-                    <Speed>  </Speed>
+                    <Mode></Mode>
+                    <Speed></Speed>
                 </Modes>
                 <CallSign> </CallSign>
             </Beacons>
@@ -6272,23 +6336,84 @@
                 <Name>Telemetry 2 </Name>
                 <Frequency>	 2410000000</Frequency>
                 <Modes>
-                    <Mode>    </Mode>
-                    <Speed> </Speed>
+                    <Mode></Mode>
+                    <Speed></Speed>
                 </Modes>
                 <CallSign>  </CallSign>
             </Beacons>
         </RadioData>
         <TelemetryData>
             <DescriptionURL>
-                <Title>  </Title>
-                <Value>  </Value>
+                <Title></Title>
+                <Value></Value>
+            </DescriptionURL>
+            <ReportURL>
+                <Title></Title>
+                <Value></Value>
+            </ReportURL>
+            <ReportEmail></ReportEmail>
+            <SoftwareURL/>
+            <Description></Description>
+        </TelemetryData>
+    </Satellites>
+    <Satellites>
+        <Name>DIWATA-2</Name>
+        <Status>Operational</Status>
+        <NasaID>43678</NasaID>
+        <UpdateDate>2018-11-06</UpdateDate>
+        <SatelliteInformationStatus>Verified</SatelliteInformationStatus>
+        <LaunchData>
+            <LaunchDate>2018-10-29</LaunchDate>
+            <LaunchingSite>Tanegeshima Space Center in Japan  </LaunchingSite>
+        </LaunchData>
+        <OSCARNumber> </OSCARNumber>
+        <Information>
+			<Title>Project page </Title>
+			<Value> http://phl-microsat.upd.edu.ph/diwata2</Value>
+			<Description lang="EN"></Description>
+		</Information>
+        <Information>
+			<Title>Facebook  </Title>
+			<Value> https://www.facebook.com/PHLMicrosat </Value>
+			<Description lang="EN"></Description>
+		</Information>
+        <RadioData>
+            <Beacons>
+                <Name>Telemetry APRS</Name>
+                <Frequency>145900000</Frequency>
+                <Modes>
+                    <Mode>BPSK</Mode>
+                    <Speed>1200 bauds</Speed>
+                </Modes>
+                <Modes>
+                    <Mode>CW</Mode>
+                    <Speed>120 WPM</Speed>
+                </Modes>
+                <CallSign>D1W2PH</CallSign>
+            </Beacons>
+            <Transponders>
+                <Name>Main</Name>
+                <FrequencyUplink>
+                    <FrequencyBegin>437700000</FrequencyBegin>
+                </FrequencyUplink>
+                <FrequencyDownlink>
+                    <FrequencyBegin>145900000</FrequencyBegin>
+                </FrequencyDownlink>
+                <Mode>FM / APRS</Mode>
+                <Inverted></Inverted>
+            </Transponders>
+        </RadioData>
+        <TelemetryData>
+            <DescriptionURL>
+                <Title>Telemetrie description</Title>
+                <Value> http://phl-microsat.upd.edu.ph/diwata2 </Value>
             </DescriptionURL>
             <ReportURL>
                 <Title> </Title>
                 <Value> </Value>
             </ReportURL>
             <ReportEmail> </ReportEmail>
-            <SoftwareURL> </SoftwareURL>
+            <SoftwareURL/>
             <Description></Description>
         </TelemetryData>
     </Satellites>
diff --git a/Data/AmsatList.xsd b/Data/AmsatList.xsd
index 640baa74589c03f5cf800068b50de0d34ac02f51..f3d2de845e7dffddbef44cf775177e3b1e4a3f5a 100644
--- a/Data/AmsatList.xsd
+++ b/Data/AmsatList.xsd
@@ -40,7 +40,7 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="LaunchDate" type="xs:NMTOKEN"/>
+  <xs:element name="LaunchDate" type="xs:string"/>
   <xs:element name="LaunchingSite" type="xs:string"/>
   <xs:element name="OSCARNumber" type="xs:string"/>
   <xs:element name="SatelliteInformationStatus" type="xs:NCName"/>
@@ -57,8 +57,8 @@
   <xs:element name="RadioData">
     <xs:complexType>
       <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="Beacons"/>
-        <xs:element minOccurs="0" ref="Transponders"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Beacons"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="Transponders"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -100,7 +100,7 @@
   <xs:element name="FrequencyUplink">
     <xs:complexType>
       <xs:sequence>
-        <xs:element ref="FrequencyBegin"/>
+        <xs:element minOccurs="0" ref="FrequencyBegin"/>
         <xs:element minOccurs="0" ref="FrequencyEnd"/>
       </xs:sequence>
     </xs:complexType>
@@ -108,12 +108,12 @@
   <xs:element name="FrequencyDownlink">
     <xs:complexType>
       <xs:sequence>
-        <xs:element ref="FrequencyBegin"/>
+        <xs:element minOccurs="0" ref="FrequencyBegin"/>
         <xs:element minOccurs="0" ref="FrequencyEnd"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-  <xs:element name="Inverted" type="xs:NCName"/>
+  <xs:element name="Inverted" type="xs:string"/>
   <xs:element name="Tone" type="xs:decimal"/>
   <xs:element name="TelemetryData">
     <xs:complexType>
diff --git a/DatabaseFile/Fox-1Cliff.xml b/DatabaseFile/Fox-1Cliff.xml
index 10c8d477a63396e70b69d1c656e9f8e396be313f..5373a65c1ec164ba5679daa5ff68b34b6a11041f 100644
--- a/DatabaseFile/Fox-1Cliff.xml
+++ b/DatabaseFile/Fox-1Cliff.xml
@@ -9,7 +9,7 @@
 			<LaunchDate> </LaunchDate>
 			<LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
 		</LaunchData>
-		<OSCARNumber> </OSCARNumber>
+		<OSCARNumber></OSCARNumber>
 
 
 
@@ -31,6 +31,17 @@
 
 		<RadioData>
 
+		<Beacons>
+				<Name>Telemetry 1 </Name>
+				<Frequency>145920000</Frequency>
+				<Modes>
+					<Mode>  FSK  </Mode>
+					<Speed> </Speed>
+				</Modes>
+		
+			
+				<CallSign> </CallSign>
+			</Beacons>
 			<Transponders>
 				<Name>FM voice repeater mode 1</Name>
 				<FrequencyUplink>
@@ -57,12 +68,12 @@
 		</RadioData>
 		<TelemetryData>
 			<DescriptionURL>
-				<Title> </Title>
-				<Value> </Value>
+				<Title>Telemesure software :  FOXTelem </Title>
+				<Value>https://www.amsat.org/foxtelem-software-for-windows-mac-linux/ </Value>
 			</DescriptionURL>
 			<ReportURL>
-				<Title> </Title>
-				<Value> </Value>
+				<Title></Title>
+				<Value></Value>
 			</ReportURL>
 			<ReportEmail></ReportEmail>
 			<SoftwareURL>https://www.amsat.org/foxtelem-software-for-windows-mac-linux/</SoftwareURL>
diff --git a/DatabaseFile/Irvine 02.xml b/DatabaseFile/Irvine 02.xml
index 741622890bf08e8ee2a3f29135a652ef733c4f3e..8baab54ed2e9c05bffb2e7cdde5e0295d63adbff 100644
--- a/DatabaseFile/Irvine 02.xml	
+++ b/DatabaseFile/Irvine 02.xml	
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?><AmsatList>
-<Satellites>
+	<Satellites>
 		<Name>Irvine 02</Name>
 		<Status>To be launched</Status>
 		<NasaID>0</NasaID>
 		<UpdateDate>2018-10-29</UpdateDate>
 		<SatelliteInformationStatus>Verified</SatelliteInformationStatus>
 		<LaunchData>
-		 <LaunchDate> </LaunchDate>
-		 <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
+			<LaunchDate></LaunchDate>
+			<LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
 		</LaunchData>
-		<OSCARNumber> </OSCARNumber>
+		<OSCARNumber></OSCARNumber>
 
-		
-			<Information>
+
+		<Information>
 			<Title>Project </Title>
 			<Value>https://www.irvinecubesat.org/irvine02</Value>
 			<Description lang="EN">  </Description>
 			<Description lang="FR"> </Description>
 		</Information>
-			<Information>
+		<Information>
 			<Title>IARU Coordination</Title>
 			<Value>http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=557</Value>
 			<Description lang="EN">Irvine 02 has been coordinated by IARU  </Description>
 			<Description lang="FR">Irvine 02a été coordonné par l'IARU </Description>
 		</Information>
-		
 
-	
+
+
 		<RadioData>
 			<Beacons>
 				<Name>Telemetry 1 </Name>
@@ -35,26 +35,22 @@
 					<Mode>  FSK  </Mode>
 					<Speed> 9600</Speed>
 				</Modes>
-		
-			
-				<CallSign> </CallSign>
+				<CallSign></CallSign>
 			</Beacons>
-
-			
-			
 		</RadioData>
+		
 		<TelemetryData>
-		<DescriptionURL>
-			<Title>  </Title>
-			<Value> </Value>
-		</DescriptionURL>
-		<ReportURL>
-			<Title> </Title>
-			<Value> </Value>
-		</ReportURL>
-		<ReportEmail> </ReportEmail>
-		<SoftwareURL> </SoftwareURL>
-		<Description></Description>
+			<DescriptionURL>
+				<Title></Title>
+				<Value></Value>
+			</DescriptionURL>
+			<ReportURL>
+				<Title></Title>
+				<Value></Value>
+			</ReportURL>
+			<ReportEmail></ReportEmail>
+			<SoftwareURL></SoftwareURL>
+			<Description></Description>
 		</TelemetryData>
 	</Satellites>
-	</AmsatList>
\ No newline at end of file
+</AmsatList>
\ No newline at end of file
diff --git a/DatabaseFile/JY1SAT.xml b/DatabaseFile/JY1SAT.xml
index 59ed8837717f6f53e1cb5d899500d01e7e2eb829..6a875aabd17f1eb49c2fc2acbe0983ee89cd0279 100644
--- a/DatabaseFile/JY1SAT.xml
+++ b/DatabaseFile/JY1SAT.xml
@@ -3,17 +3,18 @@
 		<Name>JY1SAT</Name>
 		<Status>To be launched</Status>
 		<NasaID>0</NasaID>
-		<UpdateDate>2018-10-29</UpdateDate>
+		<UpdateDate>2018-11-16</UpdateDate>
 		<SatelliteInformationStatus>Verified</SatelliteInformationStatus>
 		<LaunchData>
-		 <LaunchDate> </LaunchDate>
-		 <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
+		 <LaunchDate></LaunchDate>
+		 <LaunchingSite>PSLV</LaunchingSite>
 		</LaunchData>
-		<OSCARNumber> </OSCARNumber>
-		
+		<OSCARNumber></OSCARNumber>
+		<Information>
+			<Title>JY1SAT launch information and Dashboard</Title>
+			<Value> https://funcube.org.uk/2018/11/15/jy1sat/ </Value>
 
-		
-		
+		</Information>
 			<Information>
 			<Title>IARU Coordination</Title>
 			<Value>http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=554 </Value>
@@ -29,24 +30,27 @@
 				<Name>FUNcube telemetry </Name>
 				<Frequency>145840000</Frequency>
 				<Modes>
-					<Mode>  BPSK / SSDV  </Mode>
-					<Speed> 9600</Speed>
+					<Mode>  BPSK  </Mode>
+					<Speed> 1200</Speed>
+				</Modes>
+						<Modes>
+					<Mode>   SSDV  </Mode>
+					<Speed> </Speed>
 				</Modes>
-		
 			
-				<CallSign> </CallSign>
+				<CallSign>JY1</CallSign>
 			</Beacons>
 
 	
 	<Transponders>
 				<Name>Main</Name>
 				<FrequencyUplink>
-					<FrequencyBegin>435.100</FrequencyBegin>
-					<FrequencyEnd>435.120</FrequencyEnd>
+					<FrequencyBegin>435100000</FrequencyBegin>
+					<FrequencyEnd>435120000</FrequencyEnd>
 				</FrequencyUplink>
 				<FrequencyDownlink>
-					<FrequencyBegin>145.875 </FrequencyBegin>
-					<FrequencyEnd>145.855</FrequencyEnd>
+					<FrequencyBegin>145875000 </FrequencyBegin>
+					<FrequencyEnd>145855000</FrequencyEnd>
 				</FrequencyDownlink>
 				<Mode>SSB/CW</Mode>
 				<Inverted>yes</Inverted>
@@ -55,15 +59,15 @@
 		</RadioData>
 		<TelemetryData>
 		<DescriptionURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title> Telemetry dashboard </Title>
+			<Value> http://data2.amsat-uk.org/ui/jy1sat-fm</Value>
 		</DescriptionURL>
 		<ReportURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</ReportURL>
-		<ReportEmail></ReportEmail>
-		<SoftwareURL> </SoftwareURL>
+		<ReportEmail>operations@funcube.org.uk</ReportEmail>
+		<SoftwareURL>https://download.funcube.org.uk/JY11Sat_Dashboard_v1160.msi </SoftwareURL>
 		<Description></Description>
 		</TelemetryData>
 	</Satellites>
diff --git a/DatabaseFile/Knacksat.xml b/DatabaseFile/Knacksat.xml
index 21b9d2bbcd5f92b8cbb1eed98416987497612da5..786e8e9c8e6279da187c986a8f1180f9ba303f34 100644
--- a/DatabaseFile/Knacksat.xml
+++ b/DatabaseFile/Knacksat.xml
@@ -3,7 +3,7 @@
 		<Name>Knacksat</Name>
 		<Status>To be launched</Status>
 		<NasaID>0</NasaID>
-		<UpdateDate>2018-10-29</UpdateDate>
+		<UpdateDate>2018-11-16</UpdateDate>
 		<SatelliteInformationStatus>Verified</SatelliteInformationStatus>
 		<LaunchData>
 		 <LaunchDate> </LaunchDate>
@@ -12,7 +12,10 @@
 		<OSCARNumber> </OSCARNumber>
 		
 
-		
+			<Information>
+			<Title> project pages </Title>
+			<Value> http://www.knacksat.space</Value>
+		</Information>
 		
 			<Information>
 			<Title>IARU Coordination</Title>
@@ -28,7 +31,11 @@
 	<Beacons>
 				<Name>FUNcube telemetry </Name>
 				<Frequency>435635000</Frequency>
+				
 				<Modes>
+					<Mode>  CW  </Mode>
+					<Speed> </Speed>
+				</Modes><Modes>
 					<Mode>  GFSK  </Mode>
 					<Speed> 9600</Speed>
 				</Modes>
@@ -37,8 +44,7 @@
 					<Speed> 1200</Speed>
 				</Modes>
 		
-			
-				<CallSign> </CallSign>
+				<CallSign>HS0K</CallSign>
 			</Beacons>
 
 
@@ -50,11 +56,11 @@
 			<Value> http://www.knacksat.space/amateur-radio </Value>
 		</DescriptionURL>
 		<ReportURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</ReportURL>
-		<ReportEmail></ReportEmail>
-		<SoftwareURL> </SoftwareURL>
+		<ReportEmail>knacksat@gmail.com</ReportEmail>
+		<SoftwareURL></SoftwareURL>
 		<Description></Description>
 		</TelemetryData>
 	</Satellites>
diff --git a/DatabaseFile/MOVE II.xml b/DatabaseFile/MOVE II.xml
index a3adc56e9213dd482b208c7208da1606f5531196..c3333859a5d3faff2e39aa87ad103402ee0e51cb 100644
--- a/DatabaseFile/MOVE II.xml	
+++ b/DatabaseFile/MOVE II.xml	
@@ -57,11 +57,11 @@
 			<Value> https://www.move2space.de/MOVE-II/radio-amateurs/ </Value>
 		</DescriptionURL>
 		<ReportURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</ReportURL>
-		<ReportEmail> </ReportEmail>
-		<SoftwareURL> </SoftwareURL>
+		<ReportEmail></ReportEmail>
+		<SoftwareURL></SoftwareURL>
 		<Description></Description>
 		</TelemetryData>
 	</Satellites>
diff --git a/DatabaseFile/Minxss 2.xml b/DatabaseFile/Minxss 2.xml
index f0aae9cd1f2f942994aebd17c638fee99b198914..d9a00b51e78a30853b1a8692367ac38f85b876c6 100644
--- a/DatabaseFile/Minxss 2.xml	
+++ b/DatabaseFile/Minxss 2.xml	
@@ -45,8 +45,8 @@
 			<Value>http://lasp.colorado.edu/home/minxss/data/ </Value>
 		</DescriptionURL>
 		<ReportURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</ReportURL>
 		<ReportEmail></ReportEmail>
 		<SoftwareURL>https://github.com/jmason86/MinXSS_Beacon_Decoder/releases</SoftwareURL>
diff --git a/DatabaseFile/PW-Sat 2.xml b/DatabaseFile/PW-Sat 2.xml
index edc8d0f3d2f45c01e72195e2dee99c38aaafd624..4c7db94cd00cb7f8e22d62357d5e16662237af4c 100644
--- a/DatabaseFile/PW-Sat 2.xml	
+++ b/DatabaseFile/PW-Sat 2.xml	
@@ -31,7 +31,7 @@
 		<RadioData>
 			<Beacons>
 				<Name>Telemetry 1 </Name>
-				<Frequency>  435275000</Frequency>
+				<Frequency>435275000</Frequency>
 				<Modes>
 					<Mode> BPSK </Mode>
 					<Speed> 9600</Speed>
@@ -52,8 +52,8 @@
 			<Value> https://pw-sat.pl/en/information-for-radio-amateurs/</Value>
 		</DescriptionURL>
 		<ReportURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</ReportURL>
 		<ReportEmail></ReportEmail>
 		<SoftwareURL>https://radio.pw-sat.pl/communication/desktopsoftware</SoftwareURL>
diff --git a/DatabaseFile/Range A.xml b/DatabaseFile/Range A.xml
index 2f32e6307a7d9f2ce5bd4d80d28f25b240025cb3..94251452639a901e84780093387c463830038368 100644
--- a/DatabaseFile/Range A.xml	
+++ b/DatabaseFile/Range A.xml	
@@ -52,15 +52,15 @@
 		</RadioData>
 		<TelemetryData>
 		<DescriptionURL>
-			<Title>   n</Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</DescriptionURL>
 		<ReportURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</ReportURL>
-		<ReportEmail> </ReportEmail>
-		<SoftwareURL> </SoftwareURL>
+		<ReportEmail></ReportEmail>
+		<SoftwareURL></SoftwareURL>
 		<Description></Description>
 		</TelemetryData>
 	</Satellites>
diff --git a/DatabaseFile/Range B.xml b/DatabaseFile/Range B.xml
index 730abe6e6584d5b7a6723b2041024227268fb092..e314a2908664ca0ace89ac7a4a16f3e9dae98294 100644
--- a/DatabaseFile/Range B.xml	
+++ b/DatabaseFile/Range B.xml	
@@ -52,15 +52,15 @@
 		</RadioData>
 		<TelemetryData>
 		<DescriptionURL>
-			<Title>   n</Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</DescriptionURL>
 		<ReportURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</ReportURL>
-		<ReportEmail> </ReportEmail>
-		<SoftwareURL> </SoftwareURL>
+		<ReportEmail></ReportEmail>
+		<SoftwareURL></SoftwareURL>
 		<Description></Description>
 		</TelemetryData>
 	</Satellites>
diff --git a/DatabaseFile/SNUSAT-2.xml b/DatabaseFile/SNUSAT-2.xml
index 23579ff50c307331fc4991fc5043bef51262a4de..31e85f09d5266b5e4d3d7db7a3148b7bcbcb79ee 100644
--- a/DatabaseFile/SNUSAT-2.xml
+++ b/DatabaseFile/SNUSAT-2.xml
@@ -30,7 +30,7 @@
 					<Mode> BPSK </Mode>
 					<Speed> 9600</Speed>
 				</Modes>
-				<CallSign> </CallSign>
+				<CallSign></CallSign>
 			</Beacons>
 		<Beacons>
 				<Name>Telemetry 2 </Name>
@@ -39,19 +39,19 @@
 					<Mode> DQPSK  </Mode>
 					<Speed> 1.06Mbit/s</Speed>
 				</Modes>
-				<CallSign> </CallSign>
+				<CallSign></CallSign>
 			</Beacons>
  
 			
 		</RadioData>
 		<TelemetryData>
 		<DescriptionURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</DescriptionURL>
 		<ReportURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</ReportURL>
 		<ReportEmail></ReportEmail>
 		<SoftwareURL></SoftwareURL>
diff --git a/DatabaseFile/SeeMe.xml b/DatabaseFile/SeeMe.xml
index a2ef90198d08821b948d43170b2423a7fddb4d93..966f59a01d6fb111ee3dd07d59642495304613dc 100644
--- a/DatabaseFile/SeeMe.xml
+++ b/DatabaseFile/SeeMe.xml
@@ -50,12 +50,12 @@
 		</RadioData>
 		<TelemetryData>
 		<DescriptionURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</DescriptionURL>
 		<ReportURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</ReportURL>
 		<ReportEmail></ReportEmail>
 		<SoftwareURL></SoftwareURL>
diff --git a/DatabaseFile/Snuglite.xml b/DatabaseFile/Snuglite.xml
index f34695c37f00ea546ab7ea04e754b913bc3ffd69..e7e2ea58114a5365919964411d58a6bc3adf6215 100644
--- a/DatabaseFile/Snuglite.xml
+++ b/DatabaseFile/Snuglite.xml
@@ -9,7 +9,7 @@
 		 <LaunchDate> </LaunchDate>
 		 	 <LaunchingSite> Vandenberg Air Force Base, California </LaunchingSite>
 		</LaunchData>
-		<OSCARNumber> </OSCARNumber>
+		<OSCARNumber></OSCARNumber>
 		
 
 		
@@ -32,7 +32,7 @@
 					<Speed> 9600</Speed>
 				</Modes>
 			
-				<CallSign> </CallSign>
+				<CallSign></CallSign>
 			</Beacons>
 
 			
@@ -40,15 +40,15 @@
 		</RadioData>
 		<TelemetryData>
 		<DescriptionURL>
-			<Title>  </Title>
-			<Value>  </Value>
+			<Title></Title>
+			<Value></Value>
 		</DescriptionURL>
 		<ReportURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</ReportURL>
 		<ReportEmail></ReportEmail>
-		<SoftwareURL> </SoftwareURL>
+		<SoftwareURL></SoftwareURL>
 		<Description></Description>
 		</TelemetryData>
 	</Satellites>
diff --git a/DatabaseFile/Suomi 100.xml b/DatabaseFile/Suomi 100.xml
index f1cf37146df22171cd895fb2475dc31e4e0cc2d0..620058f8dcb6aec95c708fdc2ad53d52352c482c 100644
--- a/DatabaseFile/Suomi 100.xml	
+++ b/DatabaseFile/Suomi 100.xml	
@@ -32,8 +32,8 @@
 				<Name>Telemetry 1 </Name>
 				<Frequency>	437775000</Frequency>
 				<Modes>
-					<Mode>     </Mode>
-					<Speed>  </Speed>
+					<Mode></Mode>
+					<Speed></Speed>
 				</Modes>
 			
 				<CallSign> </CallSign>
@@ -44,8 +44,8 @@
 				<Name>Telemetry 2 </Name>
 				<Frequency>	 2410000000</Frequency>
 				<Modes>
-					<Mode>    </Mode>
-					<Speed> </Speed>
+					<Mode></Mode>
+					<Speed></Speed>
 				</Modes>
 			
 				<CallSign>  </CallSign>
@@ -53,15 +53,15 @@
 		</RadioData>
 		<TelemetryData>
 		<DescriptionURL>
-			<Title>  </Title>
-			<Value>  </Value>
+			<Title></Title>
+			<Value></Value>
 		</DescriptionURL>
 		<ReportURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</ReportURL>
-		<ReportEmail> </ReportEmail>
-		<SoftwareURL> </SoftwareURL>
+		<ReportEmail></ReportEmail>
+		<SoftwareURL></SoftwareURL>
 		<Description></Description>
 		</TelemetryData>
 	</Satellites>
diff --git a/DatabaseFile/VisionCube.xml b/DatabaseFile/VisionCube.xml
index d9052bc51790e0be548c14fdc0822f71db76b0fd..3d974d0e6052b01160882a2526b0ec994aa0bb40 100644
--- a/DatabaseFile/VisionCube.xml
+++ b/DatabaseFile/VisionCube.xml
@@ -44,11 +44,11 @@
 			<Value> http://control.kau.ac.kr/visioncube/visioncube-2/ </Value>
 		</DescriptionURL>
 		<ReportURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</ReportURL>
 		<ReportEmail>heokjune1994@gmail.com</ReportEmail>
-		<SoftwareURL> </SoftwareURL>
+		<SoftwareURL></SoftwareURL>
 		<Description></Description>
 		</TelemetryData>
 	</Satellites>
diff --git a/DatabaseFile/ZACUBE 2 (ZA 004.xml b/DatabaseFile/ZACUBE 2 (ZA 004.xml
index ef66cfed56bea36136133f29d5286e14bf63e3f1..30fa7e92f3ad66ebc8ebf09997d3c16d830c9c07 100644
--- a/DatabaseFile/ZACUBE 2 (ZA 004.xml	
+++ b/DatabaseFile/ZACUBE 2 (ZA 004.xml	
@@ -57,12 +57,12 @@
 		</RadioData>
 		<TelemetryData>
 		<DescriptionURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</DescriptionURL>
 		<ReportURL>
-			<Title> </Title>
-			<Value> </Value>
+			<Title></Title>
+			<Value></Value>
 		</ReportURL>
 		<ReportEmail></ReportEmail>
 		<SoftwareURL></SoftwareURL>
diff --git a/DatabaseFile/satellite_-20180801_BHUTAN-1.xml b/DatabaseFile/satellite_-20180801_BHUTAN-1.xml
index 6bb04f03b70fb9013d9e2cd354dbb8bb9ccdf4e7..ea0bc5c4dacf4700362560ac9fb9f630cc45f5f9 100644
--- a/DatabaseFile/satellite_-20180801_BHUTAN-1.xml
+++ b/DatabaseFile/satellite_-20180801_BHUTAN-1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><AmsatList><Satellites>
 		<Name>BHUTAN-1</Name>
 		<Status>Operational</Status>
-		<NasaID>-20180801</NasaID>
+		<NasaID>43591</NasaID>
 		<OSCARNumber/>
 		<UpdateDate>2018-08-015</UpdateDate>
 		<LaunchData>
@@ -15,7 +15,11 @@
 		<Description lang="EN">The second BIRDS Project, BIRDS-2, started in November, 2016. The participating countries are Bhutan, Malaysia, Philippines and Japan. 11 students will develop 3 identical 1U CubeSats which will have capability to perform same missions. The bus system for BIRDS-2 takes heritage from BIRDS-1 bus system and incorporates the lessons learned from BIRDS-1.
 		</Description>
 	</Information>
-				
+	<Information>
+			<Title>IARU</Title>
+			<Value> http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=562 </Value>
+		<Description lang="EN"> </Description>
+	</Information>
 		<RadioData>
 			<Beacons>
 				<Name>Main</Name>
diff --git a/DatabaseFile/satellite_-201808102_MAYA-1.xml b/DatabaseFile/satellite_-201808102_MAYA-1.xml
index 8007537ea1f834a303602c0b2d3269ee34e7bdfd..7223e14256fe4acfd11c27102266a2aed54707d7 100644
--- a/DatabaseFile/satellite_-201808102_MAYA-1.xml
+++ b/DatabaseFile/satellite_-201808102_MAYA-1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><AmsatList><Satellites>
 		<Name>MAYA-1</Name>
 		<Status>Operational</Status>
-		<NasaID>-201808102</NasaID>
+		<NasaID>43590</NasaID>
 		<OSCARNumber> </OSCARNumber>
 		<UpdateDate>2018-08-015</UpdateDate>
 		<LaunchData>
@@ -15,7 +15,11 @@
 		<Description lang="EN">The second BIRDS Project, BIRDS-2, started in November, 2016. The participating countries are Bhutan, Malaysia, Philippines and Japan. 11 students will develop 3 identical 1U CubeSats which will have capability to perform same missions. The bus system for BIRDS-2 takes heritage from BIRDS-1 bus system and incorporates the lessons learned from BIRDS-1.
 		</Description>
 	</Information>
-				
+					<Information>
+			<Title>IARU</Title>
+			<Value> http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=564 </Value>
+		<Description lang="EN"> </Description>
+	</Information>
 		<RadioData>
 			<Beacons>
 				<Name>Main</Name>
diff --git a/DatabaseFile/satellite_-201808103_UiTMSat-1.xml b/DatabaseFile/satellite_-201808103_UiTMSat-1.xml
index 08c563fea0c37c5310949329bff84fd3bf5c4a0b..8f9f24f6b69322a65da178c440174ddc9332612d 100644
--- a/DatabaseFile/satellite_-201808103_UiTMSat-1.xml
+++ b/DatabaseFile/satellite_-201808103_UiTMSat-1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><AmsatList><Satellites>
 		<Name>UiTMSat-1</Name>
 		<Status>Operational</Status>
-		<NasaID>-201808103</NasaID>
+		<NasaID>43589</NasaID>
 		<OSCARNumber> </OSCARNumber>
 		<UpdateDate>2018-08-015</UpdateDate>
 		<LaunchData>
@@ -15,7 +15,11 @@
 		<Description lang="EN">The second BIRDS Project, BIRDS-2, started in November, 2016. The participating countries are Bhutan, Malaysia, Philippines and Japan. 11 students will develop 3 identical 1U CubeSats which will have capability to perform same missions. The bus system for BIRDS-2 takes heritage from BIRDS-1 bus system and incorporates the lessons learned from BIRDS-1.
 		</Description>
 	</Information>
-				
+								<Information>
+			<Title>IARU</Title>
+			<Value> http://www.amsatuk.me.uk/iaru/finished_detail.php?serialnum=563 </Value>
+		<Description lang="EN"> </Description>
+	</Information>
 		<RadioData>
 			<Beacons>
 				<Name>Main</Name>
diff --git a/DatabaseFile/satellite_-201808152_SIRIUSSAT-2C.xml b/DatabaseFile/satellite_-201808152_SIRIUSSAT-2C.xml
index 7a3dc4368d6bb742cbe7442346ecb351e7b496d2..0a77b463b06666cc4edd5b0590f69f2b86393cf4 100644
--- a/DatabaseFile/satellite_-201808152_SIRIUSSAT-2C.xml
+++ b/DatabaseFile/satellite_-201808152_SIRIUSSAT-2C.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?><AmsatList><Satellites>
-		<Name>SIRIUSSAT-2C</Name>
+		<Name>SIRIUSSAT-2 (SXC1-182)</Name>
 		<Status>Operational</Status>
-		<NasaID>-201808152</NasaID>
+		<NasaID>43596 </NasaID>
 		<OSCARNumber> </OSCARNumber>
 		<UpdateDate>2018-08-015</UpdateDate>
 		<LaunchData>
diff --git a/DatabaseFile/satellite_-33_ParkinsonSAT (PSAT).xml b/DatabaseFile/satellite_-33_ParkinsonSAT (PSAT).xml
index 0fff68d44f3072fd1b5e6d549fdce7ffd6c60b7b..6fb235b398b211b71f797aec605fb8899901dafd 100644
--- a/DatabaseFile/satellite_-33_ParkinsonSAT (PSAT).xml	
+++ b/DatabaseFile/satellite_-33_ParkinsonSAT (PSAT).xml	
@@ -1,16 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?><AmsatList><Satellites>
+<?xml version="1.0" encoding="UTF-8"?>
+<AmsatList>
+	<Satellites>
 		<Name>ParkinsonSAT (PSAT)</Name>
-		<NasaID>-33</NasaID>
-		<UpdateDate>2015-06-05</UpdateDate>
-		<SatelliteInformationStatus>Draft</SatelliteInformationStatus>
+		<NasaID>40654 </NasaID>
+		<Status>Operational</Status>
+		<UpdateDate>2018-11-16</UpdateDate>
+		<SatelliteInformationStatus>Verified</SatelliteInformationStatus>
+		<OSCARNumber>NO84</OSCARNumber>
+		<LaunchData>
+			<LaunchDate>2015-05-20 </LaunchDate>
+			<LaunchingSite> AIR FORCE EASTERN TEST RANGE (AFETR)  </LaunchingSite>
+		</LaunchData>
 		<RadioData>
 			<Beacons>
-				<Name>APRS</Name>
+				<Name>APRS-AX25</Name>
 				<Frequency>145825000</Frequency>
 				<Modes>
-					<Mode>AX25</Mode>
+					<Mode>AFSK</Mode>
 					<Speed>1200</Speed>
 				</Modes>
+				<CallSign>W3ADO-5</CallSign>
 			</Beacons>
 			<Beacons>
 				<Name>PSK31</Name>
@@ -32,14 +41,15 @@
 			</Transponders>
 		</RadioData>
 		<Information>
-		<Title>PSAT</Title>
-		<Value>http://aprs.org/psat.html</Value>
-		<Description>ParkinsonSAT description</Description>
+			<Title>PSAT</Title>
+			<Value>http://aprs.org/psat.html</Value>
+			<Description>ParkinsonSAT description</Description>
 		</Information>
 		<TelemetryData>
 			<DescriptionURL>
-			<Title>LIVE Telemetry Downlink</Title>
-			<Value>http://pcsat.aprs.org</Value>
+				<Title>LIVE Telemetry Downlink</Title>
+				<Value>http://pcsat.aprs.org</Value>
 			</DescriptionURL>
 		</TelemetryData>
-	</Satellites></AmsatList>
\ No newline at end of file
+	</Satellites>
+</AmsatList>
\ No newline at end of file
diff --git a/Templates/XSLT/HtmlFileDescription.xsl b/Templates/XSLT/HtmlFileDescription.xsl
index fe73e293d8c1f17b6dbfd711b95efd6c2a23a3e4..2788ba54fe44c38bcc15a162f49afaa98832f667 100644
--- a/Templates/XSLT/HtmlFileDescription.xsl
+++ b/Templates/XSLT/HtmlFileDescription.xsl
@@ -1,336 +1,391 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
-  <xsl:output method="html" encoding="UTF-8" name="html"/>
-  <xsl:template match="/">
-<html>
-    <head>
-        <meta charset="utf-8"> </meta>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> </meta>
-		<!-- Global site tag (gtag.js) - Google Analytics -->
-<script  src="https://www.googletagmanager.com/gtag/js?id=UA-128629404-1" async="true" ></script>
-<script>
+	<xsl:output method="html" encoding="UTF-8" name="html"/>
+	<xsl:template match="/">
+		<html>
+			<head>
+				<meta charset="utf-8"> </meta>
+				<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> </meta>
+				<!-- Global site tag (gtag.js) - Google Analytics -->
+				<script  src="https://www.googletagmanager.com/gtag/js?id=UA-128629404-1" async="true" ></script>
+				<script>
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
 
   gtag('config', 'UA-128629404-1');
-</script>
+				</script>
+
+				<title>AMSAT SATELLITE LIST</title>
+				<meta name="description" content=""></meta>
+				<meta name="viewport" content="width=device-width, initial-scale=1"></meta>
+				<link rel="apple-touch-icon" href="apple-touch-icon.png"> </link>
+
+				<link rel="stylesheet" href="initializr/css/normalize.min.css"></link>
+				<link rel="stylesheet" href="initializr/css/main.css"></link>
+
+				<script src="initializr/js/vendor/modernizr-2.8.3-respond-1.4.2.min.js"></script>
+			</head>
+
+			<body bgcolor="#ffffff">
 
-        <title>AMSAT SATELLITE LIST</title>
-        <meta name="description" content=""></meta>
-        <meta name="viewport" content="width=device-width, initial-scale=1"></meta>
-        <link rel="apple-touch-icon" href="apple-touch-icon.png"> </link>
+				<div class="header-container">
+					<header class="wrapper clearfix">
+						<h1 class="title">AMSAT SATELLITE LIST</h1>   
+						<nav>
+							<ul>
+								<li><a href="../index.html">Home</a></li>
+								<li><a href="../AMSATLIST_Doc.xhtml">Info</a></li> 
+							</ul>
+						</nav>
+					</header>
+				</div>
+				<div class="main-container">
+					<div class="main wrapper clearfix">
 
-        <link rel="stylesheet" href="initializr/css/normalize.min.css"></link>
-        <link rel="stylesheet" href="initializr/css/main.css"></link>
+						<article>
 
-        <script src="initializr/js/vendor/modernizr-2.8.3-respond-1.4.2.min.js"></script>
-    </head>
- 
-    <body bgcolor="#ffffff">
-	
-	     <div class="header-container">
-            <header class="wrapper clearfix">
-              <h1 class="title">AMSAT SATELLITE LIST</h1>   
-                <nav>
-                    <ul>
-                          <li><a href="../index.html">Home</a></li>
-						  <li><a href="../AMSATLIST_Doc.xhtml">Info</a></li> 
-                    </ul>
-                </nav>
-            </header>
-        </div>
-  <div class="main-container">
-               <div class="main wrapper clearfix">
-
-                <article>
-				
-				<h2>Satellites with information fulfilled</h2>
-     <table class="platforms">
-     	<tr class="c0"> 
-     		<th>Info status</th><th>Nom</th><th>NasaID</th><th>Status</th>
-     	</tr>
-		 <xsl:for-each select="AmsatList/Satellites">
-		 	<xsl:if test="SatelliteInformationStatus">
-		 
-		   <tr  class="c0">
-				<td><xsl:apply-templates select="SatelliteInformationStatus"/> </td>
-				<td> <a href="SatellitePage/{NasaID}{Name}.htm"><xsl:value-of select="Name"/></a></td>
-				<td> <xsl:value-of select="NasaID"/></td>
-				<td> <xsl:apply-templates select="Status"/> </td>
-				</tr>
-				</xsl:if>
-          </xsl:for-each>
-		  
-		    </table>
-			
-			<h2>Satellites with 144 Mhz </h2>
-     <table class="platforms">
-     	<tr class="c0"> 
-     		<th>Info status</th><th>Nom</th><th>NasaID</th><th>Status</th><th>Beacon Frequency</th>
-     	</tr>
-		 <xsl:for-each select="AmsatList/Satellites">
-		 	<xsl:if test="RadioData/Beacons/Frequency  &lt; '146000000' and RadioData/Beacons/Frequency &gt; '140000000'">
-		 
-		   <tr  class="c0">
-				<td><xsl:apply-templates select="SatelliteInformationStatus"/> </td>
-				<td> <a href="SatellitePage/{NasaID}{Name}.htm"><xsl:value-of select="Name"/></a></td>
-				<td> <xsl:value-of select="NasaID"/></td>
-				<td> <xsl:apply-templates select="Status"/> </td>
-				<td> <xsl:apply-templates select="RadioData/Beacons/Frequency"/> </td>
-				</tr>
-				</xsl:if>
-          </xsl:for-each>
-		  
-		    </table>
-			
-			
-			 <h2>All satellites</h2>
-			  <table class="platforms">
-     	<tr class="c0"> 
-     		<th>Info status</th><th>Nom</th><th>NasaID</th><th>Status</th>
-     	</tr>
-     	 <xsl:for-each select="AmsatList/Satellites">
-		 
-		 
-		   <tr  class="c0">
-				<td><xsl:apply-templates select="SatelliteInformationStatus"/> </td>
-				<td> <a href="SatellitePage/{NasaID}{Name}.htm"><xsl:value-of select="Name"/></a></td>
-				<td> <xsl:value-of select="NasaID"/></td>
-				<td> <xsl:apply-templates select="Status"/> </td>
-				</tr>
-				
-          </xsl:for-each>
-      <xsl:apply-templates select="AmsatList/Satellites"/>
-      </table>
-</article>
-</div>
-	    </div>
-	         <div class="footer-container">
-            <footer class="wrapper">
-               <p><xsl:text> Information Description Status :   </xsl:text>  
-			  
-			   <xsl:text> Last Update :   </xsl:text> 
-			 
-			   </p>
-            </footer>
-        </div>
-
-        
-       <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-
-
-        <script src="initializr/js/plugins.js"></script>
-        <script src="initializr/js/main.js"></script>
-
-        
-    </body>
-	
-	
-      
-    </html>   
-	
-</xsl:template>
+							<h2>Satellites with information fulfilled</h2>
+							<table class="platforms">
+								<tr class="c0"> 
+									<th>Info status</th><th>Nom</th><th>NasaID</th><th>Status</th>
+								</tr>
+								<xsl:for-each select="AmsatList/Satellites">
+									<xsl:if test="SatelliteInformationStatus">
+
+										<tr  class="c0">
+											<td><xsl:apply-templates select="SatelliteInformationStatus"/> </td>
+											<td> <a href="SatellitePage/UK/{NasaID}{Name}.htm"><xsl:value-of select="Name"/></a></td>
+											<td> <xsl:value-of select="NasaID"/></td>
+											<td> <xsl:apply-templates select="Status"/> </td>
+										</tr>
+									</xsl:if>
+								</xsl:for-each>
+
+							</table>
+
+							<h2>Satellites with 144 Mhz </h2>
+							<table class="platforms">
+								<tr class="c0"> 
+									<th>Info status</th><th>Nom</th><th>NasaID</th><th>Status</th><th>Beacon Frequency</th>
+								</tr>
+								<xsl:for-each select="AmsatList/Satellites">
+									<xsl:if test="RadioData/Beacons/Frequency  &lt; '146000000' and RadioData/Beacons/Frequency &gt; '140000000'">
+
+										<tr  class="c0">
+											<td><xsl:apply-templates select="SatelliteInformationStatus"/> </td>
+											<td> <a href="SatellitePage/UK/{NasaID}{Name}.htm"><xsl:value-of select="Name"/></a></td>
+											<td> <xsl:value-of select="NasaID"/></td>
+											<td> <xsl:apply-templates select="Status"/> </td>
+											<td> <xsl:apply-templates select="RadioData/Beacons/Frequency"/> </td>
+										</tr>
+									</xsl:if>
+								</xsl:for-each>
+
+							</table>
+
+
+							<h2>All satellites</h2>
+							<table class="platforms">
+								<tr class="c0"> 
+									<th>Info status</th><th>Nom</th><th>NasaID</th><th>Status</th>
+								</tr>
+								<xsl:for-each select="AmsatList/Satellites">
 
-<xsl:template match="RadioData/Beacons/Frequency">
-	<xsl:if test=".  &lt; '146000000' and . &gt; '140000000'">
-		<xsl:value-of select='format-number(number(.), "###,###.##")' />  <xsl:text>  Hz  </xsl:text>
-	</xsl:if>
-</xsl:template>
 
-  <xsl:template match="Satellites">
-    <xsl:result-document format="html" encoding="UTF-8" href="SatellitePage/{NasaID}{Name}.htm" >
+									<tr  class="c0">
+										<td><xsl:apply-templates select="SatelliteInformationStatus"/> </td>
+										<td> <a href="SatellitePage/UK/{NasaID}{Name}.htm"><xsl:value-of select="Name"/></a></td>
+										<td> <xsl:value-of select="NasaID"/></td>
+										<td> <xsl:apply-templates select="Status"/> </td>
+									</tr>
 
-<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang=""> <![endif]-->
-<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8" lang=""> <![endif]-->
-<!--[if IE 8]>         <html class="no-js lt-ie9" lang=""> <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang=""> <!--<![endif]-->
-    
+								</xsl:for-each>
+								<xsl:apply-templates select="AmsatList/Satellites"/>
+							</table>
+						</article>
+					</div>
+				</div>
+				<div class="footer-container">
+					<footer class="wrapper">
+						<p><xsl:text> Information Description Status :   </xsl:text>  
 
-	<head>
-	<!-- Global site tag (gtag.js) - Google Analytics -->
-<script async="true" src="https://www.googletagmanager.com/gtag/js?id=UA-128629404-1"></script>
-<script>
+							<xsl:text> Last Update :   </xsl:text> 
+
+						</p>
+					</footer>
+				</div>
+
+
+				<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+
+
+				<script src="initializr/js/plugins.js"></script>
+				<script src="initializr/js/main.js"></script>
+
+
+			</body>
+
+
+
+		</html>   
+
+	</xsl:template>
+
+	<xsl:template match="RadioData/Beacons/Frequency">
+		<xsl:if test=".  &lt; '146000000' and . &gt; '140000000'">
+			<xsl:value-of select='format-number(number(.), "###,###.##")' />  <xsl:text>  Hz  </xsl:text>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="Satellites">
+		<xsl:result-document format="html" encoding="UTF-8" href="SatellitePage/UK/{NasaID}{Name}.htm" >
+
+			<!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang=""> <![endif]-->
+			<!--[if IE 7]>         <html class="no-js lt-ie9 lt-ie8" lang=""> <![endif]-->
+			<!--[if IE 8]>         <html class="no-js lt-ie9" lang=""> <![endif]-->
+			<!--[if gt IE 8]><!--> <html class="no-js" lang=""> <!--<![endif]-->
+
+
+				<head>
+					<!-- Global site tag (gtag.js) - Google Analytics -->
+					<script async="true" src="https://www.googletagmanager.com/gtag/js?id=UA-128629404-1"></script>
+					<script>
   window.dataLayer = window.dataLayer || [];
   function gtag(){dataLayer.push(arguments);}
   gtag('js', new Date());
 
   gtag('config', 'UA-128629404-1');
-</script>
+					</script>
+
+					<meta charset="utf-8"> </meta>
+					<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> </meta>
+					<title><xsl:value-of select="./Name"/></title>
+					<meta name="description" content=""></meta>
+					<meta name="viewport" content="width=device-width, initial-scale=1"></meta>
+					<link rel="apple-touch-icon" href="apple-touch-icon.png"> </link>
 
-       	        <meta charset="utf-8"> </meta>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> </meta>
-        <title><xsl:value-of select="./Name"/></title>
-        <meta name="description" content=""></meta>
-        <meta name="viewport" content="width=device-width, initial-scale=1"></meta>
-        <link rel="apple-touch-icon" href="apple-touch-icon.png"> </link>
+					<link rel="stylesheet" href="../../initializr/css/normalize.min.css"></link>
+					<link rel="stylesheet" href="../../initializr/css/main.css"></link>
 
-        <link rel="stylesheet" href="../initializr/css/normalize.min.css"></link>
-        <link rel="stylesheet" href="../initializr/css/main.css"></link>
+					<script src="../initializr/js/vendor/modernizr-2.8.3-respond-1.4.2.min.js"></script>
 
-        <script src="../initializr/js/vendor/modernizr-2.8.3-respond-1.4.2.min.js"></script>
 
 
-    
-    </head>
-    <body>
-        <!--[if lt IE 8]>
+				</head>
+				<body>
+					<!--[if lt IE 8]>
             <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->
 
-        <div class="header-container">
-            <header class="wrapper clearfix">
-                <h1 class="title"><xsl:value-of select="./Name"/> </h1>
-                <nav>
-                    <ul>
-                          <li><a href="../index.html">Home</a></li>
-						  <li><a href="../AMSATLIST_Doc.xhtml">Info</a></li> 
-                    </ul>
-                </nav>
-            </header>
-        </div>
-
-        <div class="main-container">
-            <div class="main wrapper clearfix">
-
-                <article>
-                 <header>
-                   <h2>General information</h2>
-					
-                       <li> <b>Nasa Identifier : </b>  <xsl:value-of select="./NasaID"/></li>
-					   <li> <b>Status : </b>  <xsl:value-of select="./Status"/></li>
-					   	<xsl:if test="./OSCARNumber">
-					   <li> <b>Oscar Number : </b>  <xsl:value-of select="./OSCARNumber"/></li>
-					   </xsl:if>
-					 
-				</header>
-
-				<section class="LaunchData">
-                           <p><xsl:apply-templates select="LaunchData"/></p>
-				</section>
-				<section class="Information">
-				<h2>Detailed Information</h2>
-						   <p><xsl:apply-templates select="Information"/></p>
-				</section>
-			<section class="RadioData">
-                          <h2>Radio</h2>
-						  <h3>Beacon</h3>
-						  <td> <xsl:apply-templates select="RadioData/Beacons"/></td>
-					
-						  
-						<xsl:if test="(RadioData/Transponders)">
-							 <h3>Transponder</h3>
-							<td> <xsl:apply-templates select="RadioData/Transponders"/></td>	
-							</xsl:if>
-							
-                                
-            </section>
-			<section class="Telemetry">
-			 <h2>TELEMETRY</h2>
-			 <p>
-			  <xsl:apply-templates select="TelemetryData"/>
-			  </p>
-			  
-			</section>
-                </article>
- 
-             
-            </div> <!-- #main -->
-        </div> <!-- #main-container -->
-
-        <div class="footer-container">
-            <footer class="wrapper">
-               <p><xsl:text> Information Description Status :   </xsl:text>  
-			   <xsl:value-of select="./SatelliteInformationStatus"/> 
-			   <xsl:text> Last Update :   </xsl:text> 
-			  <xsl:value-of select="./UpdateDate"/> 
-			   </p>
-            </footer>
-        </div>
-
-    
-   
- 
-        <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
-		<script src="../initializr/js/plugins.js"></script><script src="initializr/js/main.js"></script>
-		
-    </body>
-</html>
-
-    </xsl:result-document> 
-  </xsl:template>   
-
- <xsl:template match="RadioData/Beacons">
-    <h4>Name :  <xsl:value-of select="Name"/></h4>
-	 <li><b>Frequency :</b><xsl:value-of select='format-number(number(Frequency) div 1000000, "###,###.###")' />  <xsl:text>  MHz  </xsl:text> </li> 
-	 <li><b>Mode :</b><xsl:apply-templates select="Modes"/> </li>
-</xsl:template>
+					<div class="header-container">
+						<header class="wrapper clearfix">
 
-<xsl:template match="Modes">
-	 <xsl:apply-templates select="Mode"/> <xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
-	      <xsl:apply-templates select="Speed"/> <xsl:text> Bauds </xsl:text>
-</xsl:template>
+							<img src="../../img/amsatf.jpg" alt="Texte remplaçant l&#39;image" title="Texte à afficher" align="left" />
 
-<xsl:template match="RadioData/Transponders">
-    <h4>Name :  <xsl:value-of select="Name"/></h4>
-	<li><b>Uplink :</b>  <xsl:value-of select='format-number(number(FrequencyUplink/FrequencyBegin) div 1000000, "###,###.###")' />  <xsl:text>  MHzHz  </xsl:text> 
-	<xsl:if test="FrequencyUplink/FrequencyEnd">
-	
-				<xsl:text> - </xsl:text> 
-				<xsl:value-of select='format-number(number(FrequencyUplink/FrequencyEnd) div 1000000, "###,###.###")' />  <xsl:text>  MHzHz </xsl:text> 
-	</xsl:if>	</li>
-		
-	<li><b>Downlink :</b>  <xsl:value-of select='format-number(number(FrequencyDownlink/FrequencyBegin) div 1000000, "###,###.###")' />  <xsl:text>  MHz  </xsl:text> 
-	<xsl:if test="FrequencyDownlink/FrequencyEnd">
-				<xsl:text> - </xsl:text> 
-				<xsl:value-of select='format-number(number(FrequencyDownlink/FrequencyEnd) div 1000000, "###,###.###")' />  <xsl:text>  MHz </xsl:text> 		
-	</xsl:if> </li>	
-	<xsl:if test="Inverted">
-		<li><b>Inverted  : </b><xsl:apply-templates select="Inverted"/></li> 	
-	</xsl:if>	
-	<li><b>Mode  :</b> <xsl:apply-templates select="Mode"/> </li>
-	<xsl:if test="Tone">
-		<li><b>Tone : </b><xsl:apply-templates select="Tone"/><xsl:text>  Hz </xsl:text> </li> 	
-	</xsl:if>		
-</xsl:template>
+							<h1 class="title"><xsl:value-of select="./Name"/> </h1>
+							<nav>
+								<ul>
+									<li><a href="../../index.html">Home</a></li>
+									<li><a href="../../AMSATLIST_Doc.xhtml">Info</a></li> 
+								</ul>
+							</nav>
+						</header>
+					</div>
 
+					<div class="main-container">
+						<div class="main wrapper clearfix">
 
-<xsl:template match="LaunchData">
-	<h2>Launch Information</h2>
-    <li><b>Launch Date :</b> <xsl:value-of select="LaunchDate"/></li>
-	<li><b>Site :</b> <xsl:value-of select="LaunchingSite"/></li>
-</xsl:template>
+							<article>
+								<header>
+									<h2>General information</h2>
 
-<xsl:template match="Information">
+									<li> <b>Nasa Identifier : </b>  <xsl:value-of select="./NasaID"/></li>
+									<li> <b>Status : </b>  <xsl:value-of select="./Status"/></li>
+									<xsl:if test="./OSCARNumber">
+										<li> <b>Oscar Number : </b>  <xsl:value-of select="./OSCARNumber"/></li>
+									</xsl:if>
 
-		<xsl:text> Link :  </xsl:text> <a href="{./Value}"><xsl:value-of select="./Title"/></a>
-		 <xsl:for-each select="Description">
-		 <xsl:choose>
-		  <xsl:when test="contains(current()/@lang,'EN')"> 
-		<p>
-			<xsl:value-of select="current()"/> <br/>
-			</p>
-			
-					</xsl:when>
-					</xsl:choose>
-	
-</xsl:for-each>
-</xsl:template>
+								</header>
 
+								<section class="LaunchData">
+									<p><xsl:apply-templates select="LaunchData"/></p>
+								</section>
+								<section class="Information">
+									<h2>Detailed Information</h2>
+									<p><xsl:apply-templates select="Information"/></p>
+								</section>
+								<section class="RadioData">
+									<h2>Radio</h2>
+									<xsl:if test="RadioData/Beacons">
+									<h3>Beacon</h3>
 
-<xsl:template match="TelemetryData">
-	
+									<table class="platforms">
+										<tr class="c0"> 
+											<th>Beacon Name</th><th>Frequency</th><th>Modes</th><th>CallSign</th> 
+										</tr>
+										<td> <xsl:apply-templates select="RadioData/Beacons"/></td>
+									</table>
+									</xsl:if>
+									<xsl:if test="(RadioData/Transponders)">
+										<h3>Transponder</h3>
+
+										<table class="platforms">
+											<tr class="c0"> 
+												<th>Transponder Name</th><th>Mode</th><th>Frequency Uplink</th><th>Frequency Downlink</th><th>Inverted</th><th>CTSS Tone</th>  
+											</tr>
+
+											<td> <xsl:apply-templates select="RadioData/Transponders"/></td>	
+										</table>
+								</xsl:if>
+
+
+								</section>
+								<section class="Telemetry">
+									<h2>TELEMETRY</h2>
+									<p>
+										<xsl:apply-templates select="TelemetryData"/>
+									</p>
+
+								</section>
+							</article>
+
+
+						</div> <!-- #main -->
+					</div> <!-- #main-container -->
+
+					<div class="footer-container">
+						<footer class="wrapper">
+							<p><xsl:text> Information Description Status :   </xsl:text>  
+								<xsl:value-of select="./SatelliteInformationStatus"/> 
+								<xsl:text> Last Update :   </xsl:text> 
+								<xsl:value-of select="./UpdateDate"/> 
+								<a href="http://www.amsat-f.org"> provided by Amsat-F</a>			  
+							</p>
+						</footer>
+					</div>
+
+
+
+
+					<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+					<script src="../initializr/js/plugins.js"></script><script src="initializr/js/main.js"></script>
+
+				</body>
+			</html>
+
+		</xsl:result-document> 
+	</xsl:template>   
+
+
+
+
+
+	<xsl:template match="RadioData/Beacons">
+		<tr  class="c0">
+			<td> <xsl:value-of select="Name"/> </td>
+			<td> <xsl:value-of select='format-number(number(Frequency) div 1000000, "###,###.###")' />  <xsl:text>  MHz  </xsl:text>   </td>
+			<td>  <xsl:apply-templates select="Modes"/>  </td>
+			<td> <xsl:value-of select="CallSign"/> </td>
+		</tr>
+	</xsl:template>
+
+	<xsl:template match="Modes">
+
+		<xsl:apply-templates select="Mode"/> 
+		<xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
+		<xsl:apply-templates select="Speed"/>  
+		<br />
+	</xsl:template>
+
+	<!--
+
+						<th>Transponder Name</th><th>Mode</th><th>Frequency Uplink</th><th>Frequency Downlink</th><th>Inverted</th><th>CTSS Tone</th>     
+						
+-->
+
+
+	<xsl:template match="RadioData/Transponders">
+		<tr  class="c0">
+
+			<td> <xsl:value-of select="Name"/></td>
+			<td>
+				<xsl:apply-templates select="Mode"/> 
+			</td>
+			<td> <xsl:value-of select='format-number(number(FrequencyUplink/FrequencyBegin) div 1000000, "###,###.###")' />  <xsl:text>  MHz  </xsl:text> 
+				<xsl:if test="FrequencyUplink/FrequencyEnd">
+
+					<xsl:text> - </xsl:text> 
+					<xsl:value-of select='format-number(number(FrequencyUplink/FrequencyEnd) div 1000000, "###,###.###")' />  <xsl:text>  MHz </xsl:text> 
+				</xsl:if>	</td>
+
+			<td> <xsl:value-of select='format-number(number(FrequencyDownlink/FrequencyBegin) div 1000000, "###,###.###")' />  <xsl:text>  MHz  </xsl:text> 
+				<xsl:if test="FrequencyDownlink/FrequencyEnd">
+					<xsl:text> - </xsl:text> 
+					<xsl:value-of select='format-number(number(FrequencyDownlink/FrequencyEnd) div 1000000, "###,###.###")' />  <xsl:text>  MHz </xsl:text> 		
+				</xsl:if> </td>
+			<td>
+				<xsl:if test="Inverted">
+					<xsl:apply-templates select="Inverted"/>	
+				</xsl:if>	
+			</td>
+
+			<td>
+				<xsl:if test="Tone">
+					<xsl:apply-templates select="Tone"/><xsl:text>  Hz </xsl:text> 	
+				</xsl:if>	
+			</td>	
+		</tr>
+	</xsl:template>
+
+
+	<xsl:template match="LaunchData">
+		<h2>Launch Information</h2>
+		<li><b>Launch Date :</b> <xsl:value-of select="LaunchDate"/></li>
+		<li><b>Site :</b> <xsl:value-of select="LaunchingSite"/></li>
+	</xsl:template>
+
+	<xsl:template match="Information">
+<p>
+		<xsl:text> Link :  </xsl:text> <a href="{./Value}"><xsl:value-of select="./Title"/></a>
+		</p>
+		<xsl:for-each select="Description">
+			<xsl:choose>
+				<xsl:when test="contains(current()/@lang,'EN')"> 
+					<p>
+						<xsl:value-of select="current()"/> <br/>
+					</p>
+
+				</xsl:when>
+			</xsl:choose>
+
+		</xsl:for-each>
+	</xsl:template>
+ 
+
+	<xsl:template match="TelemetryData">
 	
+	<xsl:if test="not(DescriptionURL/Title='')">
 	<h3>Telemetry description</h3>
 		<p><xsl:apply-templates select="DescriptionURL"/></p>
+	</xsl:if>
+	<xsl:if test="not(ReportURL/Value='')">
 	<h3>Telemetry ReportURL</h3>
 			<p><a href="{ReportURL/Value}"><xsl:value-of select="ReportURL/Title"/></a></p>
+	</xsl:if>
+	<xsl:if test="not(ReportEmail='')">
+	<h3>Report Mail</h3>		
+			<p> You can send your report to :  <a href="mailto:{ReportEmail}"><xsl:value-of select="ReportEmail"/></a></p>
+			</xsl:if>
+	<xsl:if test="not(SoftwareURL='')">
+	<h3>Telemetry Software</h3>		
+			<p><a href="{SoftwareURL}"><xsl:value-of select="SoftwareURL"/></a></p>
+			</xsl:if>
 </xsl:template>
-
-<xsl:template match="DescriptionURL">
+	<xsl:template match="DescriptionURL">
 		<p><a href="{./Value}"><xsl:value-of select="./Title"/></a></p>
 
-</xsl:template>
+	</xsl:template>
 
 </xsl:stylesheet>