Merge lp:~jlcanales-gasco/stellarium/satellite-plugin into lp:stellarium

[J.L. Canales]

This branch has next new features:

1- Wrapper over gsatellite library. This class aisle gsatellite code from stelarium and works with the stellarium objects (vectors, observer, Navigation). Using this wrapper, I simplified the plugin code to get the satellite position in StelCore::AltAz framework.

2- Satellite Visibility prediction.
       I developed an algorithm to predict the optical satellite visibility. It is implemented in gSatWrapper::getVisibilityPredict() method and return next situations
                     - RADAR_SUN when satellite an observer are in the sunlit
                     - VISIBLE when satellite is in sunlit and observer is in the dark. Satellite could be visible in the sky.
                     - RADAR_NIGHT when satellite is eclipsed by the earth shadow.
                     - NOT_VISIBLE The satellite is under the observer horizon

    The visibility status is shown in a text line when the satellite is selected.

3- Updated satellites.json
    Include Updated TLE data
    Deleted M-5 R/B satellite decayed 2011-02-02
    GPS frecuencies sended by Lennert Buytenhek to developer list

I tested this code in Ubuntu 10.04 LTS

[Fabien Chéreau (xalioth)]

Hi Sorry for the large delay. I think Matthew should review this one. If he doesn't I will superficially review the features.

[J.L. Canales (jlcanales-gasco)]

Thanks Fabien,
   I know you and Matthew are very busy.... Don't worry about the delay...

2011/5/14 Fabien Chéreau <email address hidden>

> Hi Sorry for the large delay. I think Matthew should review this one. If he
> doesn't I will superficially review the features.
> --
>
> https://code.launchpad.net/~jlcanales-gasco/stellarium/satellite-plugin/+merge/53713<https://code.launchpad.net/%7Ejlcanales-gasco/stellarium/satellite-plugin/+merge/53713>
> You are the owner of lp:~jlcanales-gasco/stellarium/satellite-plugin.
>

[Fabien Chéreau (xalioth)]

OK, I try to review this now, even though I would prefer Matthew to do that. The code looks quite good!

1- in foreach loop, don't forget to use const&, it's much faster, e.g. replace
foreach(commLink c, comms)
by
foreach(const commLink& c, comms)

2- In Stellarium as a convention, we try to keep the first letter of a variabl with small case, e.g Position -> position, Vel->vel (or better 'velocity') etc..

Once this is fixed I don't have anything more to say..

[Fabien Chéreau (xalioth)]

review: Needs Fixing

[lp:~jlcanales-gasco/stellarium/satellite-plugin]

4807. By J.L. Canales on 2011-05-28

Set variables name accord to stellarium standarts

4808. By J.L. Canales on 2011-05-28

foreach clauses optimization

4809. By J.L. Canales on 2011-05-28

rebase trunk ver.4886

4810. By J.L. Canales on 2011-05-28

TLE data in satelites.json actualized

[J.L. Canales (jlcanales-gasco)]

Hi Fabien,
   I fixed variable names in the code as you suggested and I optimized all foreach loops.

Thanks..

review: Needs Resubmitting

[Fabien Chéreau (xalioth)]

Thanks! Very good job again :)
I talked to Matthew and he told me it's all OK for him, so I merge!
Fab

review: Approve

=== modified file 'plugins/Satellites/resources/satellites.json'
--- plugins/Satellites/resources/satellites.json	2010-11-18 21:25:06 +0000
+++ plugins/Satellites/resources/satellites.json	2011-05-28 23:11:30 +0000
@@ -5,359 +5,396 @@
 	{
 		"AAU CUBESAT": 
 		{
+			"comms": [],
 			"groups": [],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27846U 03031G   10322.04074654  .00000056  00000-0  45693-4 0  8768",
-			"tle2": "2 27846  98.7002 329.6105 0010121  65.8238 294.4023 14.21065071383036",
+			"tle1": "1 27846U 03031G   11147.91781985  .00000072  00000-0  53293-4 0   127",
+			"tle2": "2 27846  98.6982 157.6077 0008533 235.4647 124.5736 14.21115828410145",
 			"visible": false
 		},
 		"AJISAI (EGS)": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 16908U 86061A   10321.84797408 -.00000083  00000-0  10000-3 0  3696",
-			"tle2": "2 16908  50.0111   4.2832 0011508  98.3876 261.8263 12.44464899772183",
+			"tle1": "1 16908U 86061A   11148.22704443 -.00000083  00000-0  10000-3 0  5280",
+			"tle2": "2 16908  50.0067 135.8486 0011503 223.5240 136.4686 12.44466645796016",
 			"visible": true
 		},
 		"AKARI (ASTRO-F)": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28939U 06005A   10321.96319841  .00000176  00000-0  48808-4 0  4294",
-			"tle2": "2 28939  98.2557 325.9046 0008777  17.3359 342.8150 14.57673147251663",
+			"tle1": "1 28939U 06005A   11147.64924770  .00000205  00000-0  54996-4 0  5861",
+			"tle2": "2 28939  98.2539 155.1036 0009042 133.0963 227.0983 14.57752157279441",
 			"visible": true
 		},
 		"ALOS (DAICHI)": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28931U 06002A   10322.16815010  .00000277  00000-0  67824-4 0  3868",
-			"tle2": "2 28931  98.1416  34.1690 0001252  97.3454 262.7904 14.59583962256600",
+			"tle1": "1 28931U 06002A   11148.16272695  .00000197  00000-0  51236-4 0  9655",
+			"tle2": "2 28931  98.1178 221.3299 0002384  83.2734 276.8757 14.59396604284464",
 			"visible": true
 		},
 		"AQUA": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27424U 02022A   10321.58493059  .00000225  00000-0  60069-4 0  7964",
-			"tle2": "2 27424  98.2037 260.4353 0001229  52.7381 307.3913 14.57125042454250",
+			"tle1": "1 27424U 02022A   11147.27999565  .00000199  00000-0  54084-4 0  9614",
+			"tle2": "2 27424  98.1946  88.3460 0001719  87.9923 272.1482 14.57131306482026",
 			"visible": true
 		},
 		"ARIANE 40 R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 22830U 93061H   10321.45215012  .00000072  00000-0  44461-4 0  1704",
-			"tle2": "2 22830  98.6409 270.7390 0011452 116.7305 243.5051 14.30529655894468",
+			"tle1": "1 22830U 93061H   11147.88671773  .00000048  00000-0  35373-4 0  3176",
+			"tle2": "2 22830  98.6693 101.3151 0010184 281.6000  78.4039 14.30571521921834",
 			"visible": true
 		},
 		"ARIANE 40+ R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 23561U 95021B   10321.46177864  .00000102  00000-0  49695-4 0  7554",
-			"tle2": "2 23561  98.5048 269.0826 0006497 184.1320 175.9813 14.36461556815998",
+			"tle1": "1 23561U 95021B   11147.45408712  .00000092  00000-0  46417-4 0  9064",
+			"tle2": "2 23561  98.5314  98.0090 0007285 350.7937   9.3112 14.36520379843417",
 			"visible": true
 		},
 		"ARIANE 5 R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28499U 04049H   10322.11065144  .00000292  00000-0  46178-4 0  8812",
-			"tle2": "2 28499  98.3085 319.1702 0097421  13.9113 346.4757 14.77244642318886",
+			"tle1": "1 28499U 04049H   11147.57290161  .00000133  00000-0  25250-4 0   484",
+			"tle2": "2 28499  98.3109 155.4442 0097393 124.1132 236.9364 14.77366293347009",
 			"visible": true
 		},
 		"ARSENE (AO-24)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-17T04:03:12,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 22654U 93031B   10320.19701300 -.00000103  00000-0  10000-3 0  4211",
-			"tle2": "2 22654   4.6262 326.9563 2845044 191.7915 159.5812  1.42205628 86471",
+			"tle1": "1 22654U 93031B   11145.73270955 -.00000118  00000-0  10000-3 0  4793",
+			"tle2": "2 22654   4.4617 322.8490 2837947 203.5665 140.3153  1.42205451 89185",
 			"visible": false
 		},
 		"ASTEX 1": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 05560U 71089A   10321.54426501  .00000148  00000-0  41405-4 0  2573",
-			"tle2": "2 05560  92.7015 150.2309 0016454 165.2817 194.8866 14.46295656 53527",
+			"tle1": "1 05560U 71089A   11147.56540354  .00000115  00000-0  32315-4 0  4133",
+			"tle2": "2 05560  92.7132 211.5325 0014322 252.7666 107.1969 14.46354897 81134",
 			"visible": true
 		},
 		"ATLAS 5 CENTAUR R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 30778U 07006G   10320.74002080  .00002906  00000-0  14529-3 0  9783",
-			"tle2": "2 30778  35.7026  69.2711 0029311  89.4753 270.9331 15.16947004204691",
+			"tle1": "1 30778U 07006G   11147.85853331  .00001894  00000-0  92120-4 0  1181",
+			"tle2": "2 30778  35.7049 321.7674 0030761 329.8619  30.0336 15.18232284233896",
 			"visible": true
 		},
 		"ATLAS CENTAUR 2": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 00694U 63047A   10321.27947336  .00000544  00000-0  60756-4 0  4296",
-			"tle2": "2 00694  30.3567   5.2803 0615751 158.8195 203.9079 13.95335838345858",
+			"tle1": "1 00694U 63047A   11148.14675794  .00000712  00000-0  86112-4 0  5939",
+			"tle2": "2 00694  30.3628  40.6676 0614284   6.0000 354.7593 13.95581101372678",
 			"visible": true
 		},
 		"ATLAS CENTAUR R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 06155U 72065B   10321.25251515  .00000254  00000-0  46802-4 0  3056",
-			"tle2": "2 06155  35.0058 355.8932 0039922 207.7360 152.1214 14.68113061 38081",
+			"tle1": "1 06155U 72065B   11147.89264547  .00000164  00000-0  31742-4 0  4612",
+			"tle2": "2 06155  35.0062 329.6815 0041098 355.0761   4.9528 14.68228140 66262",
 			"visible": true
 		},
 		"CANX-1": 
 		{
+			"comms": [],
 			"groups": [],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27847U 03031H   10321.56394170  .00000051  00000-0  43577-4 0  8958",
-			"tle2": "2 27847  98.6994 329.1245 0010196  68.0650 292.1617 14.21042473382912",
+			"tle1": "1 27847U 03031H   11147.51458711  .00000007  00000-0  23424-4 0   303",
+			"tle2": "2 27847  98.6956 157.1916 0008580 235.2089 124.8257 14.21090582410032",
 			"visible": false
 		},
 		"COSMOS 1220": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 12054U 80089A   10321.73525273  .00005992  00000-0  22811-3 0  4209",
-			"tle2": "2 12054  64.9751  58.2423 0067000 295.1840  64.2337 15.25633018547254",
+			"tle1": "1 12054U 80089A   11147.55482458  .00003737  00000-0  13566-3 0  5745",
+			"tle2": "2 12054  64.9713 156.3191 0062969 238.7084 120.7873 15.28199448576382",
 			"visible": true
 		},
 		"COSMOS 1400": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 13402U 82079A   10321.22626249  .00003123  00000-0  10647-3 0  2113",
-			"tle2": "2 13402  81.1318 227.0626 0008675 141.0806 219.1049 15.30019469548433",
+			"tle1": "1 13402U 82079A   11148.16294623  .00002990  00000-0  97203-4 0  3634",
+			"tle2": "2 13402  81.1289 358.0340 0005839 206.7945 153.2990 15.31573910577791",
 			"visible": true
 		},
 		"COSMOS 1484": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 14207U 83075A   10321.41157639  .00009843  00000-0  18001-3 0  7423",
-			"tle2": "2 14207  97.5992 107.4819 0014317 140.1586 220.0697 15.49476264941477",
+			"tle1": "1 14207U 83075A   11147.70843466  .00006896  00000-0  11179-3 0  8966",
+			"tle2": "2 14207  97.6212 309.7668 0014206 157.2171 202.9734 15.53020278971129",
 			"visible": true
 		},
 		"COSMOS 1500": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 14372U 83099A   10321.12845769  .00000377  00000-0  24779-4 0  5553",
-			"tle2": "2 14372  82.5303 172.8327 0016139  60.9381 299.3487 15.04545689474809",
+			"tle1": "1 14372U 83099A   11147.58079950  .00001479  00000-0  10208-3 0  7031",
+			"tle2": "2 14372  82.5312 347.7680 0014932 118.6259 241.6466 15.04979803503593",
 			"visible": true
 		},
 		"COSMOS 1536": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 14699U 84013A   10321.89469440  .00000958  00000-0  78122-4 0  9510",
-			"tle2": "2 14699  82.5239 124.1238 0012752 297.0822  62.9095 14.98325185452400",
+			"tle1": "1 14699U 84013A   11147.88190211  .00000509  00000-0  40173-4 0  1275",
+			"tle2": "2 14699  82.5252 301.1741 0015276  14.6094 345.5560 14.98563416481005",
 			"visible": true
 		},
 		"COSMOS 1544": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 14819U 84027A   10321.63993351  .00000913  00000-0  56594-4 0  9367",
-			"tle2": "2 14819  82.5288 246.9530 0019294  96.7873 263.5548 15.08365747451517",
+			"tle1": "1 14819U 84027A   11147.47224983  .00000482  00000-0  28567-4 0   859",
+			"tle2": "2 14819  82.5235  61.2733 0020839 166.1293 194.0516 15.08847332480281",
 			"visible": true
 		},
 		"COSMOS 1812": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 17295U 87003A   10322.09026341  .00000494  00000-0  34704-4 0  3392",
-			"tle2": "2 17295  82.5212 326.4211 0014808  74.0680 286.2210 15.02820218296659",
+			"tle1": "1 17295U 87003A   11147.49783928  .00000613  00000-0  43103-4 0  4884",
+			"tle2": "2 17295  82.5228 142.6396 0013364 136.9130 223.3138 15.03220141325252",
 			"visible": true
 		},
 		"COSMOS 1833": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 17589U 87027A   10322.06976277 -.00000288  00000-0 -12932-3 0  7422",
-			"tle2": "2 17589  70.9119 194.6216 0008253  42.7831 317.3929 14.12744328220892",
+			"tle1": "1 17589U 87027A   11148.24064485 -.00000131  00000-0 -44374-4 0  8938",
+			"tle2": "2 17589  70.9174 152.9219 0009257 159.0914 201.0587 14.12797555247890",
 			"visible": true
 		},
 		"COSMOS 1844": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 17973U 87041A   10322.21681652 -.00000220  00000-0 -90484-4 0  7652",
-			"tle2": "2 17973  70.8986 296.7291 0029735 133.9161 226.4416 14.13749421213493",
+			"tle1": "1 17973U 87041A   11147.82909751  .00000303  00000-0  18499-3 0  9150",
+			"tle2": "2 17973  70.8933 255.2046 0032197 206.0983 153.8516 14.13765701240430",
 			"visible": true
 		},
 		"COSMOS 1867": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 18187U 87060A   10320.99965099 -.00000083  00000-0  65206-5 0   298",
-			"tle2": "2 18187  65.0093 116.1366 0020310 268.1166  91.7593 14.30872188219996",
+			"tle1": "1 18187U 87060A   11147.92340742 -.00000079  00000-0  79401-5 0  1817",
+			"tle2": "2 18187  65.0065 299.2069 0018484 257.3993 102.5021 14.30883976247451",
 			"visible": true
 		},
 		"COSMOS 1933": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 18958U 88020A   10321.90724267  .00000627  00000-0  52146-4 0  1431",
-			"tle2": "2 18958  82.5301 251.5206 0014526 134.0958 226.1467 14.96974428231223",
+			"tle1": "1 18958U 88020A   11148.20137794  .00000521  00000-0  42666-4 0  3177",
+			"tle2": "2 18958  82.5312  68.7889 0011944 209.2254 150.8324 14.97200079259843",
 			"visible": true
 		},
 		"COSMOS 1953": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 19210U 88050A   10322.06312001  .00000719  00000-0  60073-4 0  2580",
-			"tle2": "2 19210  82.5194 188.2663 0018139 123.4982 236.8022 14.96919625217307",
+			"tle1": "1 19210U 88050A   11147.15693478  .00000398  00000-0  32007-4 0  4318",
+			"tle2": "2 19210  82.5190   6.3954 0015168 202.3216 157.7348 14.97233916245746",
 			"visible": true
 		},
 		"COSMOS 1975": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 19573U 88093A   10321.55765679  .00000483  00000-0  40995-4 0   289",
-			"tle2": "2 19573  82.5203 135.0498 0018183 143.4031 216.8431 14.95617309199519",
+			"tle1": "1 19573U 88093A   11147.55580551  .00000880  00000-0  76238-4 0  2024",
+			"tle2": "2 19573  82.5226 312.7875 0015962 223.8492 136.1463 14.95859535228064",
 			"visible": true
 		},
 		"COSMOS 2058": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 20465U 90010A   10321.52771920  .00000101  00000-0  75034-5 0  9577",
-			"tle2": "2 20465  82.4937  27.2601 0019589  72.6426 287.6917 14.91204430126354",
+			"tle1": "1 20465U 90010A   11148.22568950  .00000208  00000-0  18150-4 0  1282",
+			"tle2": "2 20465  82.4933 204.8294 0018528 146.4761 213.7627 14.91426952154922",
 			"visible": true
 		},
 		"COSMOS 2084": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 20663U 90055A   10322.04059121  .00000423  00000-0  59723-4 0  9940",
-			"tle2": "2 20663  62.7946 291.9385 0146351  74.5451 287.1733 14.85601721102038",
+			"tle1": "1 20663U 90055A   11147.85452146  .00000529  00000-0  68935-4 0  1628",
+			"tle2": "2 20663  62.7930  20.9397 0149091  93.7626 268.0527 14.85871350130380",
 			"visible": true
 		},
 		"COSMOS 2123 & RS-12/13": 
 		{
+			"comms": [],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 21089U 91007A   10321.27227065  .00000061  00000-0  48594-4 0  6285",
-			"tle2": "2 21089  82.9216 242.1235 0028743 329.5544  30.3950 13.74498352992360",
+			"tle1": "1 21089U 91007A   11147.50386414  .00000050  00000-0  36427-4 0  7935",
+			"tle2": "2 21089  82.9208 100.2216 0029483 150.1590 210.1256 13.74505345 18632",
 			"visible": false
 		},
 		"COSMOS 2151": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 21422U 91042A   10321.16822220  .00000519  00000-0  54134-4 0  7687",
-			"tle2": "2 21422  82.5025   6.7900 0016437  23.2213 336.9771 14.87703186 50568",
+			"tle1": "1 21422U 91042A   11147.64598370  .00000175  00000-0  16320-4 0  9374",
+			"tle2": "2 21422  82.5031 185.7853 0017446  99.5577 260.7609 14.87891567 79038",
 			"visible": true
 		},
 		"COSMOS 2228": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 22286U 92094A   10322.28879263  .00000571  00000-0  66681-4 0  2174",
-			"tle2": "2 22286  82.5178 111.9741 0022821 145.7871 214.4818 14.83229559965764",
+			"tle1": "1 22286U 92094A   11147.18625483  .00000388  00000-0  44283-4 0  3836",
+			"tle2": "2 22286  82.5192 294.1672 0020298 242.7645 117.1501 14.83388873993911",
 			"visible": true
 		},
 		"COSMOS 2242": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 22626U 93024A   10321.07810957  .00000376  00000-0  42741-4 0  9741",
-			"tle2": "2 22626  82.5195 140.7333 0021223 149.4748 210.7738 14.83378199949225",
+			"tle1": "1 22626U 93024A   11147.57544595  .00000294  00000-0  32763-4 0  1446",
+			"tle2": "2 22626  82.5198 321.4231 0018707 242.5450 117.3862 14.83537994977615",
 			"visible": true
 		},
 		"COSMOS 2278": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 23087U 94023A   10321.47863511 -.00000286  00000-0 -12741-3 0  3282",
-			"tle2": "2 23087  71.0526 341.2012 0010914 276.7126  83.2754 14.13306573854821",
+			"tle1": "1 23087U 94023A   11147.85462571 -.00000276  00000-0 -12163-3 0  4831",
+			"tle2": "2 23087  71.0514 301.4926 0009237 335.6316  24.4368 14.13397889881864",
 			"visible": true
 		},
 		"COSMOS 2428": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 31792U 07029A   10322.43231715  .00000242  00000-0  15734-3 0  7746",
-			"tle2": "2 31792  70.9787  44.5760 0010517 291.5803 195.5281 14.12301192174805",
+			"tle1": "1 31792U 07029A   11148.16357632  .00000292  00000-0  18352-3 0  3436",
+			"tle2": "2 31792  71.0039   5.5634 0007390   2.4518 135.8771 14.12444436201734",
 			"visible": true
 		},
 		"COSMOS 482 DESCENT CRAFT": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 06073U 72023E   10321.92498856  .00017419  32452-5  12855-3 0  4440",
-			"tle2": "2 06073  52.0954 165.4093 2142712 349.4730   6.7235 11.31104252 73643",
+			"tle1": "1 06073U 72023E   11148.02158367  .00017568  33889-5  12197-3 0  9757",
+			"tle2": "2 06073  52.1034  28.8929 2110742 347.6528   7.9404 11.38478721 95339",
 			"visible": true
 		},
 		"CUBESAT XI-IV (CO-57)": 
@@ -370,10 +407,10 @@
 			}],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27848U 03031J   10321.46501887  .00000092  00000-0  63310-4 0  9282",
-			"tle2": "2 27848  98.7147 327.3727 0010502  91.6177 268.6213 14.20534985382807",
+			"tle1": "1 27848U 03031J   11146.99041294  .00000085  00000-0  59686-4 0   674",
+			"tle2": "2 27848  98.7120 155.1823 0008695 265.9103  94.1054 14.20589556409851",
 			"visible": false
 		},
 		"CUBESAT XI-V (CO-58)": 
@@ -386,10 +423,10 @@
 			}],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28895U 05043F   10320.95687593  .00000268  00000-0  65050-4 0  7299",
-			"tle2": "2 28895  97.9922 200.1807 0018257 163.0814 197.0991 14.59964955269275",
+			"tle1": "1 28895U 05043F   11147.71217575  .00000140  00000-0  38331-4 0  8843",
+			"tle2": "2 28895  97.9692  24.8888 0016465 285.4679  74.4725 14.60100579297254",
 			"visible": false
 		},
 		"CUTE-1 (CO-55)": 
@@ -402,50 +439,54 @@
 			}],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27844U 03031E   10321.62418058  .00000122  00000-0  76920-4 0  9806",
-			"tle2": "2 27844  98.7096 328.4033 0010577  87.1900 273.0500 14.20746617382877",
+			"tle1": "1 27844U 03031E   11147.05028817  .00000097  00000-0  65360-4 0  1180",
+			"tle2": "2 27844  98.7055 156.0584 0008867 261.8360  98.1803 14.20809745409917",
 			"visible": false
 		},
 		"CUTE-1.7+APD II (CO-65)": 
 		{
+			"comms": [],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 32785U 08021C   10321.18948827  .00000026  00000-0  99818-5 0  8380",
-			"tle2": "2 32785  97.8791  23.8528 0015447 143.4947 216.7293 14.81763530138144",
+			"tle1": "1 32785U 08021C   11147.35039361  .00000770  00000-0  10362-3 0    02",
+			"tle2": "2 32785  97.8500 211.6403 0013762 241.7760 118.2103 14.81993280166452",
 			"visible": false
 		},
 		"CZ-2C R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 31114U 07010B   10322.07647720  .00000103  00000-0  67358-4 0  9660",
-			"tle2": "2 31114  98.2311 328.4548 0060325   0.8576 359.2732 14.18662479186725",
+			"tle1": "1 31114U 07010B   11147.08053935 -.00000083  00000-0 -20901-4 0  1187",
+			"tle2": "2 31114  98.2328 144.9397 0060190 165.3284 194.9619 14.18690998213668",
 			"visible": true
 		},
 		"CZ-2D R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28738U 05024B   10321.50458818  .00000013  00000-0  57637-5 0  7833",
-			"tle2": "2 28738  97.7642 342.1340 0010660 230.7361 129.2921 15.01180024294000",
+			"tle1": "1 28738U 05024B   11147.12434934  .00000482  00000-0  41913-4 0  9292",
+			"tle2": "2 28738  97.7519 172.4235 0012097 323.6133  36.4266 15.01563688322605",
 			"visible": true
 		},
 		"CZ-4B R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 29507U 06046C   10321.56731790  .00000941  00000-0  95038-4 0  3294",
-			"tle2": "2 29507  97.6713 317.7885 0045319  26.2514 334.0988 14.92659926221574",
+			"tle1": "1 29507U 06046C   11147.54099419  .00000107  00000-0  15621-4 0  5065",
+			"tle2": "2 29507  97.6794 144.0639 0045059 108.1195 252.4943 14.92900630250068",
 			"visible": true
 		},
 		"DELFI-C3 (DO-64)": 
@@ -458,68 +499,75 @@
 			}],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 32789U 08021G   10321.21324818  .00001518  00000-0  19563-3 0  8380",
-			"tle2": "2 32789  97.8850  24.5524 0016051 143.3748 216.8611 14.82436660138178",
+			"tle1": "1 32789U 08021G   11147.13385282  .00000868  00000-0  11310-3 0    33",
+			"tle2": "2 32789  97.8579 212.5217 0014208 241.9235 118.0589 14.83033912166466",
 			"visible": false
 		},
 		"DELTA 1 R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 20323U 89089B   10321.27312581  .00000230  00000-0  70383-4 0  9147",
-			"tle2": "2 20323  97.1134 256.0457 0074783  75.7235 285.2263 14.46833229106966",
+			"tle1": "1 20323U 89089B   11146.93854871  .00000064  00000-0  26326-4 0   671",
+			"tle2": "2 20323  97.1209  56.5535 0072964 196.4008 163.4827 14.46893575134534",
 			"visible": true
 		},
 		"DELTA 2 R/B(1)": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 20453U 90008B   10321.49392407  .00001510  00000-0  11448-3 0  9309",
-			"tle2": "2 20453  35.6329  74.5652 0374061 313.9182  43.1211 14.60506260 93814",
+			"tle1": "1 20453U 90008B   11147.26298253  .00002727  00000-0  20540-3 0   849",
+			"tle2": "2 20453  35.6295  71.7236 0368619  46.6847 316.3982 14.61444776121729",
 			"visible": true
 		},
 		"DOVE (DO-17)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 20440U 90005E   10322.02256351  .00000077  00000-0  44084-4 0  7644",
-			"tle2": "2 20440  98.3295 277.4733 0011914  65.2494 294.9929 14.32191059 87551",
+			"tle1": "1 20440U 90005E   11146.90877631  .00000065  00000-0  39820-4 0  9197",
+			"tle2": "2 20440  98.3581 100.2144 0010095 216.6812 143.3678 14.32231446114737",
 			"visible": false
 		},
 		"DTUSAT": 
 		{
+			"comms": [],
 			"groups": [],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27842U 03031C   10320.77355081  .00000071  00000-0  52609-4 0  9772",
-			"tle2": "2 27842  98.7020 328.3742 0010472  70.1472 290.0840 14.21067100382856",
+			"tle1": "1 27842U 03031C   11147.98806950  .00000067  00000-0  50853-4 0  1247",
+			"tle2": "2 27842  98.7011 157.6927 0008451 234.7567 125.2831 14.21118230410156",
 			"visible": false
 		},
 		"DUMMY MASS 1": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24925U 97048A   10320.84408499  .00000160  00000-0  15981-4 0  6871",
-			"tle2": "2 24925  86.3338  70.7806 0004629 255.1600 104.9114 14.83885550714899",
+			"tle1": "1 24925U 97048A   11147.55979928  .00000070  00000-0  50989-5 0  8563",
+			"tle2": "2 24925  86.3355 342.5617 0005926 318.0976  41.9789 14.83934276743322",
 			"visible": false
 		},
 		"DUMMY MASS 2": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24926U 97048B   10322.20261985  .00000149  00000-0  14743-4 0  6851",
-			"tle2": "2 24926  86.3334  70.8836 0005429 256.3400 103.7222 14.83666288714993",
+			"tle1": "1 24926U 97048B   11148.13732661  .00000100  00000-0  87805-5 0  8527",
+			"tle2": "2 24926  86.3338 343.0529 0006998 320.2008  39.8700 14.83714736743307",
 			"visible": false
 		},
 		"ECHO (AO-51)": 
@@ -537,50 +585,54 @@
 			}],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28375U 04025K   10321.98368703  .00000058  00000-0  30148-4 0  8269",
-			"tle2": "2 28375  98.0750 306.8366 0084607 351.3459   8.6272 14.40710020335659",
+			"tle1": "1 28375U 04025K   11146.99867424  .00000082  00000-0  37176-4 0  9794",
+			"tle2": "2 28375  98.0967 126.5611 0084114 133.6405 227.1793 14.40757153363019",
 			"visible": false
 		},
 		"ENVISAT": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.6, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": true,
-			"tle1": "1 27386U 02009A   10322.07553564  .00000026  00000-0  23278-4 0  6294",
-			"tle2": "2 27386  98.5352  27.1137 0001114 100.9176 259.2139 14.37467034455781",
+			"tle1": "1 27386U 02009A   11148.14555770  .00000068  00000-0  37372-4 0  2001",
+			"tle2": "2 27386  98.5062 216.4472 0001073  86.8863 273.2469 14.37480457483230",
 			"visible": true
 		},
 		"ERBS": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 15354U 84108B   10322.09484089  .00000899  00000-0  60704-4 0  5239",
-			"tle2": "2 15354  56.9878 172.0645 0012038 313.3748  46.6261 15.16486078430751",
+			"tle1": "1 15354U 84108B   11147.17696478  .00001537  00000-0  91486-4 0  6693",
+			"tle2": "2 15354  56.9877 106.1554 0011398 298.0600  61.9290 15.17129784459595",
 			"visible": true
 		},
 		"ERS-1": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 21574U 91050A   10322.07334264  .00000178  00000-0  75242-4 0  8956",
-			"tle2": "2 21574  98.1596 317.3488 0033624 314.1892  45.6534 14.35746963 12546",
+			"tle1": "1 21574U 91050A   11148.16106303  .00000135  00000-0  60246-4 0   520",
+			"tle2": "2 21574  98.1729 138.3998 0035134  98.4397 262.0776 14.35819673 39968",
 			"visible": true
 		},
 		"ERS-2": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 23560U 95021A   10322.39716399  .00000067  00000-0  41180-4 0  7582",
-			"tle2": "2 23560  98.5540  35.1649 0001320  90.3862 269.7483 14.32246730814533",
+			"tle1": "1 23560U 95021A   11148.13202730  .00000139  00000-0  65150-4 0  3365",
+			"tle2": "2 23560  98.5219 223.2421 0001046 111.9796 248.1515 14.34155989841854",
 			"visible": true
 		},
 		"EYESAT-1 (AO-27)": 
@@ -596,492 +648,866 @@
 			}],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 22825U 93061C   10321.46194113  .00000045  00000-0  34629-4 0  6774",
-			"tle2": "2 22825  98.5049 265.5800 0008447 172.8833 187.2468 14.29316170893940",
+			"tle1": "1 22825U 93061C   11147.07977091  .00000143  00000-0  73081-4 0  8262",
+			"tle2": "2 22825  98.5309  91.9693 0008394 344.3978  15.6944 14.29348253921174",
 			"visible": false
 		},
 		"GENESIS 1": 
 		{
+			"comms": [],
 			"groups": [],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 29252U 06029A   10321.85801590  .00000738  00000-0  65904-4 0  1954",
-			"tle2": "2 29252  64.5080 135.7063 0035189 323.8341  36.0391 15.03804939238894",
+			"tle1": "1 29252U 06029A   11147.56355073  .00000505  00000-0  48407-4 0  3390",
+			"tle2": "2 29252  64.5119 245.1717 0051779 295.4101  64.1661 15.04215136267575",
 			"visible": false
 		},
 		"GENESIS 2": 
 		{
+			"comms": [],
 			"groups": [],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 31789U 07028A   10321.59358919  .00000599  00000-0  56673-4 0  9388",
-			"tle2": "2 31789  64.5082 168.3754 0012611 180.2342 179.8778 15.03476481186056",
+			"tle1": "1 31789U 07028A   11147.54160602  .00000517  00000-0  50241-4 0   847",
+			"tle2": "2 31789  64.5078 277.4054 0014674 350.7604   9.3239 15.03868285214768",
 			"visible": false
 		},
 		"GIOVE-A": 
 		{
+			"comms": [],
 			"groups": ["experimental", "navigation"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28922U 05051A   10319.78847524  .00000094  00000-0  10000-3 0  7538",
-			"tle2": "2 28922  56.1186 143.8018 0008435   7.6899 352.3763  1.69478136 30328",
+			"tle1": "1 28922U 05051A   11145.96077023  .00000077  00000-0  10000-3 0  8256",
+			"tle2": "2 28922  56.1540 138.7656 0008708 350.7558   9.2297  1.69473943 33560",
 			"visible": false
 		},
 		"GIOVE-B": 
 		{
+			"comms": [],
 			"groups": ["experimental", "navigation"],
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 32781U 08020A   10320.06435302  .00000065  00000-0  10000-3 0  3775",
-			"tle2": "2 32781  55.9165 178.4009 0018258 217.0989 142.8701  1.70949172 15967",
+			"tle1": "1 32781U 08020A   11146.33943011  .00000074  00000-0  10000-3 0  4572",
+			"tle2": "2 32781  55.9142 173.2608 0022350 227.8910 131.9793  1.70953834 19235",
 			"visible": false
 		},
 		"GOES 1": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.4, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 08366U 75100A   10321.15607874  .00000037  00000-0  10000-3 0  4204",
-			"tle2": "2 08366  14.2143 343.5020 0002025 286.9764  72.9818  1.00264340128149",
+			"tle1": "1 08366U 75100A   11146.59568724 -.00000052  00000-0  10000-3 0  6242",
+			"tle2": "2 08366  14.1427 341.8304 0002697  51.3178 308.6658  1.00312725130052",
 			"visible": false
 		},
 		"GOES 10": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.4, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24786U 97019A   10320.39622520  .00000085  00000-0  10000-3 0  6745",
-			"tle2": "2 24786   4.7825  66.9569 0005573  55.4887 304.4294  0.99069967 49658",
+			"tle1": "1 24786U 97019A   11146.15750901 -.00000238  00000-0  10000-3 0  9060",
+			"tle2": "2 24786   5.2307  64.8264 0009266  16.3721 343.4619  0.99072504 51540",
 			"visible": false
 		},
 		"GOES 11": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.4, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 26352U 00022A   10320.43963461  .00000099  00000-0  10000-3 0   874",
-			"tle2": "2 26352   0.1204 259.0743 0004219 319.3577 220.2907  1.00268431 38590",
+			"tle1": "1 26352U 00022A   11147.26321532  .00000094  00000-0  10000-3 0  3463",
+			"tle2": "2 26352   0.3382  81.2216 0002390  18.6451 103.9944  1.00268296 40519",
 			"visible": false
 		},
 		"GOES 12": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.4, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 26871U 01031A   10319.16652134 -.00000276  00000-0  10000-3 0  8439",
-			"tle2": "2 26871   0.9153  80.1045 0003332 195.5657 137.7787  1.00254870 34184",
+			"tle1": "1 26871U 01031A   11148.15927302 -.00000277  00000-0  10000-3 0  1154",
+			"tle2": "2 26871   1.3799  77.3866 0004506  10.9278 155.0432  1.00270810 36125",
 			"visible": false
 		},
 		"GOES 13": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.4, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 29155U 06018A   10321.40747509 -.00000237  00000-0  10000-3 0  3553",
-			"tle2": "2 29155   0.2402  77.6106 0002860  17.1949  33.7394  1.00272082 16453",
+			"tle1": "1 29155U 06018A   11147.45938163 -.00000246  00000-0  10000-3 0  6129",
+			"tle2": "2 29155   0.1745 265.7007 0006678 162.9099 266.7530  1.00274134 18360",
 			"visible": false
 		},
 		"GOES 14": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.4, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 35491U 09033A   10320.48564222 -.00000082  00000-0  10000-3 0  7203",
-			"tle2": "2 35491   0.3554 261.4141 0002348 132.1542  92.2822  1.00272680  5113",
+			"tle1": "1 35491U 09033A   11148.23154291 -.00000083  00000-0  10000-3 0  9962",
+			"tle2": "2 35491   0.1055  88.7340 0006319 322.5771 172.6851  1.00270563  7046",
 			"visible": false
 		},
 		"GOES 15": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.4, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 36411U 10008A   10321.40757830 -.00000170  00000-0  10000-3 0  3475",
-			"tle2": "2 36411   0.2284 256.1316 0004397 308.6176 269.0653  1.00271634  2626",
+			"tle1": "1 36411U 10008A   11148.12776833 -.00000174  00000-0  10000-3 0  6079",
+			"tle2": "2 36411   0.2187  93.8915 0003035  11.3764  96.5001  1.00262083  4549",
 			"visible": false
 		},
 		"GOES 2": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.4, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 10061U 77048A   10320.63144333  .00000059  00000-0  10000-3 0  5148",
-			"tle2": "2 10061  14.7042 351.9947 0016618 268.1243  91.6707  0.99393547 66948",
+			"tle1": "1 10061U 77048A   11146.77655711 -.00000090  00000-0  10000-3 0  7482",
+			"tle2": "2 10061  14.7043 350.3312 0012395 278.1010  81.7227  0.99400751 68843",
 			"visible": false
 		},
 		"GOES 3": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.4, 0],
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 10953U 78062A   10320.12827168 -.00000106  00000-0  10000-3 0  2032",
-			"tle2": "2 10953  14.5108 355.7445 0003561  15.3183 344.6790  1.00279936 71859",
+			"tle1": "1 10953U 78062A   11145.59140802 -.00000141  00000-0  10000-3 0  4224",
+			"tle2": "2 10953  14.5431 354.0494 0006543  52.2704 307.7494  1.00275259 73763",
 			"visible": false
 		},
 		"GOES 4": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.4, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 11964U 80074A   10320.76250638 -.00000005  00000-0  10000-3 0  7429",
-			"tle2": "2 11964  14.9472 359.4084 0036075 309.0199  50.6486  0.99230463 71165",
+			"tle1": "1 11964U 80074A   11146.22236985  .00000008  00000-0  10000-3 0  9778",
+			"tle2": "2 11964  15.0113 357.7065 0034982 321.3535  38.3640  0.99229894 73056",
 			"visible": false
 		},
 		"GOES 5": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.4, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 12472U 81049A   10320.23917441  .00000047  00000-0  10000-3 0  7000",
-			"tle2": "2 12472  14.1552   9.7879 0001203 198.7327 161.2456  1.00319240 65892",
+			"tle1": "1 12472U 81049A   11146.59134782 -.00000218  00000-0  10000-3 0  9075",
+			"tle2": "2 12472  14.3050   8.0239 0003109  45.4103 314.5802  1.00333359 67815",
 			"visible": false
 		},
 		"GOES 6": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.4, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 14050U 83041A   10320.26117081  .00000067  00000-0  10000-3 0  7195",
-			"tle2": "2 14050  13.9183  14.7918 0001675  29.2939 330.6950  1.00278665158993",
+			"tle1": "1 14050U 83041A   11146.66636102 -.00000085  00000-0  10000-3 0  9245",
+			"tle2": "2 14050  14.1083  12.9935 0005993  32.5722 327.4288  1.00326687160919",
 			"visible": false
 		},
 		"GOES 7": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.4, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 17561U 87022A   10320.41567054  .00000089  00000-0  10000-3 0  7121",
-			"tle2": "2 17561  13.0097  31.9735 0002442 130.0688 230.7456  1.00294130 70103",
+			"tle1": "1 17561U 87022A   11147.38384685  .00000075  00000-0  10000-3 0  9815",
+			"tle2": "2 17561  13.3115  29.9477 0004846  89.7082  90.3091  1.00285977 72022",
 			"visible": false
 		},
 		"GOES 8": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.4, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 23051U 94022A   10321.18642021 -.00000152  00000-0  10000-3 0  4773",
-			"tle2": "2 23051   7.0118  66.5166 0006434 167.5628 192.3461  0.98905483 67849",
+			"tle1": "1 23051U 94022A   11147.26780774  .00000028  00000-0  10000-3 0  7096",
+			"tle2": "2 23051   7.4618  64.0068 0002388 227.9871 131.8430  0.98902821 69734",
 			"visible": false
 		},
 		"GOES 9": 
 		{
+			"comms": [],
 			"groups": ["scientific"],
 			"hintColor": [0, 0.4, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 23581U 95025A   10319.99030040 -.00000113  00000-0  10000-3 0  7515",
-			"tle2": "2 23581   6.5587  64.2663 0003139   8.3755 351.5284  0.98801991 56535",
+			"tle1": "1 23581U 95025A   11146.27486637  .00000037  00000-0  10000-3 0  9811",
+			"tle2": "2 23581   7.0067  61.9619 0008429 350.8770   8.9554  0.98798041 58422",
 			"visible": false
 		},
 		"GPS BIIA-10 (PRN 32)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 20959U 90103A   10321.11248561 -.00000057  00000-0  10000-3 0  9192",
-			"tle2": "2 20959  54.8358 262.1040 0128089 307.9954  50.8536  2.00573345146298",
+			"tle1": "1 20959U 90103A   11146.57345812 -.00000066  00000-0  10000-3 0  1557",
+			"tle2": "2 20959  54.7162 254.3930 0123130 314.2816  44.7277  2.00562489150118",
 			"visible": false
 		},
 		"GPS BIIA-11 (PRN 24)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 21552U 91047A   10321.02532941  .00000032  00000-0  10000-3 0  9112",
-			"tle2": "2 21552  54.3514 200.1707 0058202 339.0815  20.7707  2.00437683141879",
+			"tle1": "1 21552U 91047A   11146.01375768  .00000035  00000-0  10000-3 0  1192",
+			"tle2": "2 21552  54.3362 192.5221 0062132 341.9830  17.8719  2.00558624145683",
 			"visible": false
 		},
 		"GPS BIIA-14 (PRN 26)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 22014U 92039A   10320.41495998 -.00000057  00000-0  10000-3 0  8061",
-			"tle2": "2 22014  56.6771 321.2404 0196877  63.5922 298.4420  2.00567995128018",
+			"tle1": "1 22014U 92039A   11146.36883969 -.00000073  00000-0  10000-3 0    83",
+			"tle2": "2 22014  56.5703 313.7948 0202575  65.5607 296.5358  2.00566612131845",
 			"visible": false
 		},
 		"GPS BIIA-15 (PRN 27)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 22108U 92058A   10321.01209044 -.00000082  00000-0  10000-3 0  7043",
-			"tle2": "2 22108  56.1347  14.3204 0219713 282.7421  74.8693  2.00577178133207",
+			"tle1": "1 22108U 92058A   11146.97357063 -.00000088  00000-0  10000-3 0  9171",
+			"tle2": "2 22108  56.2092   6.7919 0218363 288.3161  69.3659  2.00563809137038",
 			"visible": false
 		},
 		"GPS BIIA-21 (PRN 09)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 22700U 93042A   10321.04277744 -.00000082  00000-0  10000-3 0   425",
-			"tle2": "2 22700  56.2680  15.7756 0167737  88.9544 273.0207  2.00561251127362",
+			"tle1": "1 22700U 93042A   11146.50185870 -.00000091  00000-0  10000-3 0  2512",
+			"tle2": "2 22700  56.3483   8.2960 0171002  90.0471 271.9573  2.00564671131188",
 			"visible": false
 		},
 		"GPS BIIA-23 (PRN 04)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 22877U 93068A   10320.68464105  .00000033  00000-0  10000-3 0  3930",
-			"tle2": "2 22877  53.7794 197.2579 0093507  37.7418 322.9958  2.00550718125001",
+			"tle1": "1 22877U 93068A   11147.13429071  .00000056  00000-0  10000-3 0  6041",
+			"tle2": "2 22877  53.7510 189.4325 0094100  40.5255 320.2474  2.00566129128842",
 			"visible": false
 		},
 		"GPS BIIA-24 (PRN 06)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 23027U 94016A   10320.88215133  .00000095  00000-0  10000-3 0  3599",
-			"tle2": "2 23027  53.5711 134.1884 0063173 306.0246  53.4266  2.00565202122315",
+			"tle1": "1 23027U 94016A   11145.33893574  .00000065  00000-0  10000-3 0  5618",
+			"tle2": "2 23027  53.6292 126.3857 0068982 313.2529  46.1653  2.00566564126113",
 			"visible": false
 		},
 		"GPS BIIA-25 (PRN 03)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 23833U 96019A   10320.89876013  .00000090  00000-0  10000-3 0  5531",
-			"tle2": "2 23833  53.1646 130.0617 0136302  60.2953 301.0820  2.00569434107290",
+			"tle1": "1 23833U 96019A   11146.35149474  .00000059  00000-0  10000-3 0  7619",
+			"tle2": "2 23833  53.2215 122.1255 0140566  62.1308 299.2705  2.00565241111113",
 			"visible": false
 		},
 		"GPS BIIA-26 (PRN 10)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 23953U 96041A   10320.27401040 -.00000059  00000-0  10000-3 0   536",
-			"tle2": "2 23953  54.5070 258.4620 0094401  37.5160 323.1478  2.00579669105077",
+			"tle1": "1 23953U 96041A   11146.21876788 -.00000064  00000-0  10000-3 0  2541",
+			"tle2": "2 23953  54.3846 250.6651 0100219  39.7372 321.0069  2.00571426108909",
 			"visible": false
 		},
 		"GPS BIIA-27 (PRN 30)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24320U 96056A   10320.72332948 -.00000023  00000-0  00000+0 0  7770",
-			"tle2": "2 24320  54.8966  74.6876 0129009  89.1936 272.2733  2.00368425103747",
+			"tle1": "1 24320U 96056A   11146.73933133 -.00000058  00000-0  00000+0 0  9917",
+			"tle2": "2 24320  55.0404  66.9727 0125341  87.4792 273.9446  2.00563877107574",
 			"visible": false
 		},
 		"GPS BIIA-28 (PRN 08)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25030U 97067A   10320.40385014 -.00000086  00000-0  10000-3 0  4499",
-			"tle2": "2 25030  56.9916  21.6110 0115182 182.5585 177.4403  2.00566571 95508",
+			"tle1": "1 25030U 97067A   11146.85324726 -.00000089  00000-0  10000-3 0  6673",
+			"tle2": "2 25030  57.0808  14.2366 0115633 185.1912 174.7326  2.00573454 99343",
 			"visible": false
 		},
 		"GPS BIIF-1  (PRN 25)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps", "navigation"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 36585U 10022A   10320.67578579 -.00000018  00000-0  10000-3 0  2157",
-			"tle2": "2 36585  55.0804  76.3366 0007064 139.5062 220.5366  2.00554428  3451",
+			"tle1": "1 36585U 10022A   11146.13577973 -.00000053  00000-0  10000-3 0  4401",
+			"tle2": "2 36585  55.2329  68.6720 0005924  32.9908 327.0417  2.00565467  7270",
 			"visible": false
 		},
 		"GPS BIIR-02 (PRN 13)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24876U 97035A   10320.77088488 -.00000056  00000-0  10000-3 0  5225",
-			"tle2": "2 24876  56.8102 321.4638 0040540 104.6188 255.8581  2.00562515 97612",
+			"tle1": "1 24876U 97035A   11146.22570203 -.00000072  00000-0  10000-3 0  7245",
+			"tle2": "2 24876  56.7085 314.0739 0045066 106.2224 254.2709  2.00572311101434",
 			"visible": false
 		},
 		"GPS BIIR-03 (PRN 11)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25933U 99055A   10321.04580504  .00000061  00000-0  10000-3 0  9680",
-			"tle2": "2 25933  50.8861 183.2006 0112115  49.7802 311.2861  2.00585494 81438",
+			"tle1": "1 25933U 99055A   11146.98184234  .00000070  00000-0  10000-3 0  1692",
+			"tle2": "2 25933  50.8786 174.8507 0115343  52.8036 308.3083  2.00563401 85268",
 			"visible": false
 		},
 		"GPS BIIR-04 (PRN 20)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 26360U 00025A   10321.13888164 -.00000055  00000-0  10000-3 0   592",
-			"tle2": "2 26360  53.5861 255.1821 0041605  71.2482 289.2055  2.00549219 77132",
+			"tle1": "1 26360U 00025A   11147.09958490 -.00000056  00000-0  10000-3 0  2553",
+			"tle2": "2 26360  53.4705 247.2186 0043453  73.1908 287.3088  2.00564838 80965",
 			"visible": false
 		},
 		"GPS BIIR-05 (PRN 28)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 26407U 00040A   10320.48083372 -.00000010  00000-0  10000-3 0   115",
-			"tle2": "2 26407  55.7054  79.3571 0166334 249.0643 109.1401  2.00562354 75791",
+			"tle1": "1 26407U 00040A   11146.43897377 -.00000047  00000-0  10000-3 0  2094",
+			"tle2": "2 26407  55.8372  71.8047 0172505 252.3174 105.7860  2.00560909 79624",
 			"visible": false
 		},
 		"GPS BIIR-06 (PRN 14)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 26605U 00071A   10321.08217991 -.00000057  00000-0  10000-3 0   180",
-			"tle2": "2 26605  56.4194 320.1386 0059372 240.8894 118.5337  2.00573741 73405",
+			"tle1": "1 26605U 00071A   11146.53596430 -.00000074  00000-0  10000-3 0  2208",
+			"tle2": "2 26605  56.3106 312.6781 0058954 240.6648 118.7356  2.00565269 77225",
 			"visible": false
 		},
 		"GPS BIIR-07 (PRN 18)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 26690U 01004A   10320.94941170 -.00000058  00000-0  10000-3 0  8974",
-			"tle2": "2 26690  53.5859 258.2778 0120314 230.0730 128.8624  2.00555324 71819",
+			"tle1": "1 26690U 01004A   11146.41052756 -.00000064  00000-0  10000-3 0   975",
+			"tle2": "2 26690  53.4622 250.3395 0124795 231.7515 127.1360  2.00572002 75635",
 			"visible": false
 		},
 		"GPS BIIR-08 (PRN 16)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27663U 03005A   10320.30712000 -.00000010  00000-0  10000-3 0  3070",
-			"tle2": "2 27663  55.8075  78.9382 0057935 349.5643  10.3026  2.00562084 57153",
+			"tle1": "1 27663U 03005A   11146.77081927 -.00000050  00000-0  10000-3 0  5161",
+			"tle2": "2 27663  55.9361  71.3777 0063957 351.5184   8.3593  2.00548270 60994",
 			"visible": false
 		},
 		"GPS BIIR-09 (PRN 21)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27704U 03010A   10320.86512595  .00000034  00000-0  10000-3 0  1916",
-			"tle2": "2 27704  53.4034 197.7975 0170527 221.1199 137.6667  2.00569238 55958",
+			"tle1": "1 27704U 03010A   11147.32028342  .00000057  00000-0  10000-3 0  3981",
+			"tle2": "2 27704  53.3841 189.9029 0179825 225.2048 133.3972  2.00552722 59792",
 			"visible": false
 		},
 		"GPS BIIR-10 (PRN 22)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28129U 03058A   10320.99238147 -.00000058  00000-0  10000-3 0  7847",
-			"tle2": "2 28129  53.4538 258.5335 0057009 250.7042 108.6784  2.00557607 50667",
+			"tle1": "1 28129U 03058A   11146.45322422 -.00000064  00000-0  10000-3 0  9844",
+			"tle2": "2 28129  53.3325 250.5713 0058174 247.3574 112.0433  2.00559311 54486",
 			"visible": false
 		},
 		"GPS BIIR-11 (PRN 19)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28190U 04009A   10321.44258092  .00000105  00000-0  10000-3 0  7611",
-			"tle2": "2 28190  54.9027 141.7733 0067586 356.6771   3.3334  2.00573707 48843",
+			"tle1": "1 28190U 04009A   11146.89418214  .00000080  00000-0  10000-3 0  9726",
+			"tle2": "2 28190  54.9364 134.1985 0073307 358.8845   1.1007  2.00565405 52660",
 			"visible": false
 		},
 		"GPS BIIR-12 (PRN 23)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28361U 04023A   10320.23111280 -.00000060  00000-0  10000-3 0  5800",
-			"tle2": "2 28361  55.3702 317.7593 0070330 181.3327 178.6708  2.00569178 46901",
+			"tle1": "1 28361U 04023A   11146.67914697 -.00000077  00000-0  10000-3 0  8012",
+			"tle2": "2 28361  55.2607 310.0659 0072246 182.1277 177.8340  2.00551890 50746",
 			"visible": false
 		},
 		"GPS BIIR-13 (PRN 02)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28474U 04045A   10320.72233179  .00000036  00000-0  10000-3 0  4659",
-			"tle2": "2 28474  53.8276 196.2419 0097254 181.7135 178.3386  2.00564744 44278",
+			"tle1": "1 28474U 04045A   11147.18018912  .00000059  00000-0  10000-3 0  6762",
+			"tle2": "2 28474  53.8044 188.4332 0102882 189.7799 170.0874  2.00553859 48119",
 			"visible": false
 		},
 		"GPS BIIRM-1 (PRN 17)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28874U 05038A   10320.57483195  .00000101  00000-0  10000-3 0  7380",
-			"tle2": "2 28874  55.0431 138.6802 0058396 217.4694 142.1622  2.00563131 37695",
+			"tle1": "1 28874U 05038A   11146.03688090  .00000076  00000-0  10000-3 0  9382",
+			"tle2": "2 28874  55.0801 131.1341 0064465 224.5164 134.9599  2.00553738 41517",
 			"visible": false
 		},
 		"GPS BIIRM-2 (PRN 31)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 29486U 06042A   10321.19243251 -.00000082  00000-0  10000-3 0   542",
-			"tle2": "2 29486  56.0602  17.5064 0076893 299.0130  60.2705  2.00550053 30407",
+			"tle1": "1 29486U 06042A   11146.64302847 -.00000091  00000-0  10000-3 0  2817",
+			"tle2": "2 29486  56.1334   9.9918 0078384 304.5774  54.7183  2.00565713 34227",
 			"visible": false
 		},
 		"GPS BIIRM-3 (PRN 12)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 29601U 06052A   10321.62864018 -.00000017  00000-0  10000-3 0  1178",
-			"tle2": "2 29601  55.7317  77.8746 0034034 337.5942  22.2660  2.00576092 29329",
+			"tle1": "1 29601U 06052A   11146.09121404 -.00000049  00000-0  10000-3 0  3436",
+			"tle2": "2 29601  55.8752  70.3815 0037716 345.2107  14.6733  2.00554585 33129",
 			"visible": false
 		},
 		"GPS BIIRM-4 (PRN 15)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 32260U 07047A   10320.94901034 -.00000061  00000-0  00000+0 0  8296",
-			"tle2": "2 32260  54.5501 316.1527 0035520 344.1941  15.7119  2.00543971 22707",
+			"tle1": "1 32260U 07047A   11146.40563135 -.00000078  00000-0  00000+0 0   481",
+			"tle2": "2 32260  54.4295 308.3409 0033966 353.7788   6.1654  2.00570514 26520",
 			"visible": false
 		},
 		"GPS BIIRM-5 (PRN 29)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 32384U 07062A   10319.76555155  .00000098  00000-0  10000-3 0  8606",
-			"tle2": "2 32384  55.0533 139.1884 0030107 283.6887  76.0255  2.00567236 21403",
+			"tle1": "1 32384U 07062A   11146.71287178  .00000078  00000-0  10000-3 0   797",
+			"tle2": "2 32384  55.1030 131.5885 0028603 289.5724  70.1179  2.00548824 25255",
 			"visible": false
 		},
 		"GPS BIIRM-6 (PRN 07)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 32711U 08012A   10320.85939262 -.00000084  00000-0  10000-3 0  6876",
-			"tle2": "2 32711  55.7600  17.4988 0041602 183.3929 176.6319  2.00562414 19630",
+			"tle1": "1 32711U 08012A   11147.31447230 -.00000088  00000-0  10000-3 0  8858",
+			"tle2": "2 32711  55.8385   9.8935 0043942 184.1629 175.8450  2.00565484 23477",
 			"visible": false
 		},
 		"GPS BIIRM-7 (PRN 01)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps", "navigation"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-03-16T22:42:29,
 			"orbitVisible": false,
-			"tle1": "1 34661U 09014A   10320.77879695 -.00000017  00000-0  10000-3 0  6280",
-			"tle2": "2 34661  55.3927  77.0236 0042480  53.0717 307.3041  2.00581468 12149",
+			"tle1": "1 34661U 09014A   11073.93382874  .00000039  00000-0  10000-3 0  7624",
+			"tle2": "2 34661  55.4738  72.3003 0043387  48.2005 312.2018  2.00575843 14515",
 			"visible": false
 		},
 		"GPS BIIRM-8 (PRN 05)": 
 		{
+			"comms": [
+			{
+				"description": "L1",
+				"frequency": 1575.42,
+				"modulation": "QPSK"
+			}, 
+			{
+				"description": "L2",
+				"frequency": 1227.6,
+				"modulation": "BPSK"
+			}],
 			"groups": ["gps", "navigation"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 35752U 09043A   10320.82391565 -.00000056  00000-0  10000-3 0  3836",
-			"tle2": "2 35752  54.7937 257.0192 0019906   4.2612 355.7530  2.00577456  9211",
+			"tle1": "1 35752U 09043A   11147.27209942 -.00000056  00000-0  10000-3 0  5999",
+			"tle2": "2 35752  54.6729 249.2618 0021699   8.6152 351.4370  2.00564500 13052",
 			"visible": false
 		},
 		"H-2A R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 29394U 06037B   10321.14124416  .00014272  00000-0  28256-3 0  2831",
-			"tle2": "2 29394  97.3839  95.5474 0030096 281.4689  78.3180 15.46686087235040",
+			"tle1": "1 29394U 06037B   11147.87933333  .00014882  00000-0  22992-3 0  4722",
+			"tle2": "2 29394  97.4115 292.1612 0023506 299.0824  60.8060 15.53885895264738",
 			"visible": true
 		},
 		"HAMSAT (VO-52)": 
@@ -1094,980 +1520,1078 @@
 			}],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28650U 05017B   10321.89204864  .00000179  00000-0  28933-4 0  6490",
-			"tle2": "2 28650  97.6733   9.1669 0027807 131.7535 228.6069 14.81851600299454",
+			"tle1": "1 28650U 05017B   11148.04316748  .00000607  00000-0  82429-4 0  8049",
+			"tle2": "2 28650  97.6423 192.0734 0025882 226.3470 133.5569 14.82062003327762",
 			"visible": false
 		},
 		"HOPE-1 (HO-68)": 
 		{
+			"comms": [],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 36122U 09072B   10322.08853940 -.00000045  00000-0  00000+0 0  8557",
-			"tle2": "2 36122 100.4495  20.8202 0007585 349.2152  10.8788 13.16282787 44469",
+			"tle1": "1 36122U 09072B   11148.09657577 -.00000045  00000-0  00000+0 0  4133",
+			"tle2": "2 36122 100.4157 209.2103 0007131 271.0429  88.9861 13.16286480 69596",
 			"visible": false
 		},
 		"HST": 
 		{
+			"comms": [],
 			"description": "The Hubble Space Telescope",
 			"groups": ["scientific"],
 			"hintColor": [0.5, 0.9, 0.9],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": true,
-			"tle1": "1 20580U 90037B   10322.23800227  .00000811  00000-0  49095-4 0  6770",
-			"tle2": "2 20580  28.4711 314.0931 0003174  44.1313 315.9453 15.01096561927925",
+			"tle1": "1 20580U 90037B   11147.24512652  .00000545  00000-0  28585-4 0  7708",
+			"tle2": "2 20580  28.4693 153.2495 0003337 256.1202 103.8907 15.01364093956507",
 			"visible": true
 		},
 		"IDEFIX & ARIANE 42P R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27422U 02021B   10320.77972703  .00000032  00000-0  29776-4 0  4850",
-			"tle2": "2 27422  98.4736  31.6831 0012754 138.8926 221.3210 14.28582782443306",
+			"tle1": "1 27422U 02021B   11148.24589005  .00000049  00000-0  36431-4 0  6407",
+			"tle2": "2 27422  98.4492 218.3688 0011703 299.1185  60.8823 14.28619633470784",
 			"visible": true
 		},
 		"INFORMATOR 1 & RS-14": 
 		{
+			"comms": [],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 21087U 91006A   10321.26179763  .00000050  00000-0  36420-4 0  7433",
-			"tle2": "2 21087  82.9446  22.2674 0033735 280.1991  79.5360 13.75061869993611",
+			"tle1": "1 21087U 91006A   11147.77878424  .00000061  00000-0  47649-4 0  9086",
+			"tle2": "2 21087  82.9422 240.3814 0036664 103.2382 257.2865 13.75072750 19937",
 			"visible": false
 		},
 		"INTERCOSMOS 24": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 20261U 89080A   10321.45561600  .00000241  00000-0  71234-4 0  3150",
-			"tle2": "2 20261  82.5907 124.6336 1213815 229.6774 119.1983 12.53542099964514",
+			"tle1": "1 20261U 89080A   11147.68793592  .00000128  00000-0  30435-4 0  4691",
+			"tle2": "2 20261  82.5906   1.1736 1214875 150.3580 217.2402 12.53643522988478",
 			"visible": true
 		},
 		"INTERCOSMOS 25": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 21819U 91086A   10321.77666247  .00001407  00000-0  27292-3 0  2379",
-			"tle2": "2 21819  82.5560  61.9916 1548551 139.8349 232.8140 11.99307606823529",
+			"tle1": "1 21819U 91086A   11147.46695384  .00000537  00000-0  98468-4 0  4106",
+			"tle2": "2 21819  82.5539 308.3378 1547592  97.5417 280.3505 11.99547602846389",
 			"visible": true
 		},
 		"IRIDIUM 10": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24839U 97030D   10321.20717569  .00000221  00000-0  71838-4 0  2831",
-			"tle2": "2 24839  86.3924 274.8512 0002396  78.9597 281.1874 14.34218669702390",
+			"tle1": "1 24839U 97030D   11147.23339533  .00000044  00000-0  85752-5 0  5132",
+			"tle2": "2 24839  86.3974 195.0194 0002551  89.4986 270.6524 14.34213424729777",
 			"visible": false
 		},
 		"IRIDIUM 11": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25578U 98074B   10321.67267637  .00000135  00000-0  41125-4 0  3109",
-			"tle2": "2 25578  86.3969 180.2365 0004415  70.9633 289.2041 14.34226170632903",
+			"tle1": "1 25578U 98074B   11147.35003111  .00000181  00000-0  57584-4 0  5510",
+			"tle2": "2 25578  86.3939 100.5910 0003793 117.0094 243.1489 14.34218370660238",
 			"visible": false
 		},
 		"IRIDIUM 12": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24837U 97030B   10321.01054922  .00000246  00000-0  80673-4 0  2817",
-			"tle2": "2 24837  86.3918 274.9392 0002480  80.0874 280.0606 14.34219058702354",
+			"tle1": "1 24837U 97030B   11147.38561739  .00000181  00000-0  57492-4 0  5109",
+			"tle2": "2 24837  86.3970 194.9626 0002547  88.9329 271.2168 14.34214020729784",
 			"visible": false
 		},
 		"IRIDIUM 13": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24840U 97030E   10321.15643449  .00000260  00000-0  85613-4 0  2370",
-			"tle2": "2 24840  86.3926 274.9591 0002388  75.1857 284.9610 14.34219116702376",
+			"tle1": "1 24840U 97030E   11147.39195948  .00000113  00000-0  33461-4 0  4619",
+			"tle2": "2 24840  86.3973 195.0440 0002596  86.5745 273.5745 14.34213429729785",
 			"visible": false
 		},
 		"IRIDIUM 14": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25777U 99032A   10322.08111919 -.00000701  00000-0 -16824-3 0  2660",
-			"tle2": "2 25777  86.5138 148.3843 0002377  82.7292 277.4282 14.54928269607376",
+			"tle1": "1 25777U 99032A   11147.38389785  .00000318  00000-0  69025-4 0  5169",
+			"tle2": "2 25777  86.5131  68.8574 0002572  77.4674 282.6804 14.54941028635049",
 			"visible": false
 		},
 		"IRIDIUM 15": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24869U 97034A   10321.42621263 -.00000533  00000-0 -19727-3 0  3137",
-			"tle2": "2 24869  86.3924 306.4716 0002519  82.0778 278.0682 14.34214039699388",
+			"tle1": "1 24869U 97034A   11147.31292214  .00000221  00000-0  71870-4 0  5471",
+			"tle2": "2 24869  86.3960 226.6581 0002401  88.1171 272.0302 14.34219102726745",
 			"visible": false
 		},
 		"IRIDIUM 16": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24841U 97030F   10321.43119589  .00000250  00000-0  80380-4 0  2774",
-			"tle2": "2 24841  86.4007 275.4667 0001407 138.6220 221.5088 14.35375397702616",
+			"tle1": "1 24841U 97030F   11147.50974164  .00000120  00000-0  35020-4 0  5092",
+			"tle2": "2 24841  86.4074 195.6442 0002283  30.9361 329.1970 14.35427313730024",
 			"visible": false
 		},
 		"IRIDIUM 17": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24870U 97034B   10321.49071438  .00000168  00000-0  52594-4 0  2736",
-			"tle2": "2 24870  86.3926 306.2559 0002466  78.6257 281.5227 14.34517658699421",
+			"tle1": "1 24870U 97034B   11147.54356992  .00000171  00000-0  53578-4 0  5044",
+			"tle2": "2 24870  86.3974 226.3372 0002608  78.3331 281.8158 14.34572464726813",
 			"visible": false
 		},
 		"IRIDIUM 18": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24872U 97034D   10321.45792477 -.00000521  00000-0 -19325-3 0  2668",
-			"tle2": "2 24872  86.3933 306.6190 0002338  83.6545 276.4894 14.34214341699381",
+			"tle1": "1 24872U 97034D   11147.27486662  .00000169  00000-0  53203-4 0  4955",
+			"tle2": "2 24872  86.3962 226.8416 0002487  84.2386 275.9095 14.34218938726735",
 			"visible": false
 		},
 		"IRIDIUM 19": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24965U 97056A   10321.17841157 -.00001092  00000-0 -39725-3 0  2338",
-			"tle2": "2 24965  86.3948 243.3741 0002390  81.2888 278.8589 14.34210640687989",
+			"tle1": "1 24965U 97056A   11147.41395200  .00000005  00000-0 -53685-5 0  4703",
+			"tle2": "2 24965  86.3968 163.5183 0002569  84.7273 275.4221 14.34213284715398",
 			"visible": false
 		},
 		"IRIDIUM 2": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25527U 98066A   10321.62038287  .00000888  00000-0  71445-4 0  6405",
-			"tle2": "2 25527  85.5616 345.3065 0011591 126.1138 234.1183 14.98553598655857",
+			"tle1": "1 25527U 98066A   11147.30480103  .00000862  00000-0  68350-4 0  9030",
+			"tle2": "2 25527  85.5634 236.5821 0010004 160.8046 199.3559 14.99080162684415",
 			"visible": false
 		},
 		"IRIDIUM 20": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25577U 98074A   10321.71064365 -.00000538  00000-0 -19925-3 0   744",
-			"tle2": "2 25577  86.3972 179.9683 0002216  84.7976 275.3458 14.34216946623946",
+			"tle1": "1 25577U 98074A   11147.38812350  .00000167  00000-0  52565-4 0  3184",
+			"tle2": "2 25577  86.3940 100.3308 0002567  78.8652 281.2855 14.34217162651272",
 			"visible": false
 		},
 		"IRIDIUM 21": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25778U 99032B   10321.80230652 -.00000032  00000-0 -18474-4 0  1453",
-			"tle2": "2 25778  86.3952 148.5091 0003879  59.9921 300.1662 14.34216578603631",
+			"tle1": "1 25778U 99032B   11147.34024053 -.00001530  00000-0 -55351-3 0  3871",
+			"tle2": "2 25778  86.3948  68.8842 0004135 103.2448 256.9236 14.34208589630949",
 			"visible": false
 		},
 		"IRIDIUM 22": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24907U 97043E   10321.17786726 -.00000473  00000-0 -17590-3 0  2529",
-			"tle2": "2 24907  86.3986 180.6214 0002256  82.3340 277.8149 14.34216531693265",
+			"tle1": "1 24907U 97043E   11147.34368030  .00000202  00000-0  65020-4 0  4880",
+			"tle2": "2 24907  86.3947 100.8032 0002535  79.2769 280.8716 14.34219227720668",
 			"visible": false
 		},
 		"IRIDIUM 23": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24906U 97043D   10321.11439964  .00000138  00000-0  42294-4 0  2831",
-			"tle2": "2 24906  86.3981 180.1854 0002143  81.3937 278.7502 14.34223812693252",
+			"tle1": "1 24906U 97043D   11147.35047442  .00000204  00000-0  65769-4 0  5200",
+			"tle2": "2 24906  86.3934 100.3125 0002539  80.6262 279.5231 14.34210751720669",
 			"visible": false
 		},
 		"IRIDIUM 24": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25105U 97082B   10321.49445523  .00000140  00000-0  39432-4 0  7866",
-			"tle2": "2 25105  86.3939 169.1564 0011246 339.3679  20.7064 14.38372389677152",
+			"tle1": "1 25105U 97082B   11147.38291733  .00000179  00000-0  51948-4 0   189",
+			"tle2": "2 25105  86.3917  88.7936 0014403  61.6869 298.5780 14.38438456704598",
 			"visible": false
 		},
 		"IRIDIUM 25": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24904U 97043B   10321.12712542 -.00000423  00000-0 -15808-3 0  2655",
-			"tle2": "2 24904  86.3972 180.2546 0002264  83.1881 276.9568 14.34218061693242",
+			"tle1": "1 24904U 97043B   11147.36272012  .00000154  00000-0  47996-4 0  5051",
+			"tle2": "2 24904  86.3937 100.3848 0002494  76.4679 283.6803 14.34218694720651",
 			"visible": false
 		},
 		"IRIDIUM 26": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24903U 97043A   10321.16518061 -.00000476  00000-0 -17690-3 0  3759",
-			"tle2": "2 24903  86.3977 180.2981 0002204  82.1890 277.9529 14.34217886693288",
+			"tle1": "1 24903U 97043A   11147.40077101  .00000185  00000-0  58844-4 0  6124",
+			"tle2": "2 24903  86.3942 100.4318 0002586  77.9272 282.2229 14.34218952720694",
 			"visible": false
 		},
 		"IRIDIUM 28": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24948U 97051E   10321.42635464  .00000160  00000-0  49810-4 0  1119",
-			"tle2": "2 24948  86.3980 211.8595 0002059  93.9241 266.2185 14.34347232689868",
+			"tle1": "1 24948U 97051E   11147.50176047  .00000045  00000-0  91177-5 0  3491",
+			"tle2": "2 24948  86.3968 132.0741 0002162  75.0652 285.0782 14.34401992717254",
 			"visible": false
 		},
 		"IRIDIUM 29": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24944U 97051A   10321.18766590 -.00000888  00000-0 -32440-3 0  2179",
-			"tle2": "2 24944  86.3974 211.8088 0002228  79.3222 280.8183 14.34213629689838",
+			"tle1": "1 24944U 97051A   11147.42321376  .00000058  00000-0  13752-4 0  4515",
+			"tle2": "2 24944  86.3949 131.9687 0002565  82.5442 277.6055 14.34216566717243",
 			"visible": false
 		},
 		"IRIDIUM 3": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25431U 98048A   10321.72966925 -.00000153  00000-0 -61523-4 0  1564",
-			"tle2": "2 25431  86.3975 180.1723 0001784  70.2637 289.8711 14.34220048641120",
+			"tle1": "1 25431U 98048A   11147.33735733  .00000129  00000-0  38882-4 0  3946",
+			"tle2": "2 25431  86.3940 100.5731 0002988  70.4165 289.7364 14.34218196668440",
 			"visible": false
 		},
 		"IRIDIUM 30": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24949U 97051F   10322.31665290 -.00001261  00000-0 -45755-3 0  2770",
-			"tle2": "2 24949  86.3976 211.4157 0002141  79.3215 280.8233 14.34210101689999",
+			"tle1": "1 24949U 97051F   11147.43590799  .00000048  00000-0  10187-4 0  5214",
+			"tle2": "2 24949  86.3948 132.0457 0002642  79.1513 280.9984 14.34216338717246",
 			"visible": false
 		},
 		"IRIDIUM 31": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24950U 97051G   10321.19400842 -.00000915  00000-0 -33383-3 0  2451",
-			"tle2": "2 24950  86.3982 211.8818 0002191  76.0638 284.0762 14.34213484689848",
+			"tle1": "1 24950U 97051G   11147.42955709  .00000012  00000-0 -28896-5 0  4736",
+			"tle2": "2 24950  86.3948 132.0470 0002623  78.6059 281.5439 14.34216393717255",
 			"visible": false
 		},
 		"IRIDIUM 32": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24945U 97051B   10321.20669323 -.00000432  00000-0 -16144-3 0  2357",
-			"tle2": "2 24945  86.3978 211.8180 0002292  78.1725 281.9661 14.34216671689857",
+			"tle1": "1 24945U 97051B   11147.44225259  .00000003  00000-0 -58347-5 0  4747",
+			"tle2": "2 24945  86.3943 131.9792 0002620  80.8941 279.2550 14.34215986717267",
 			"visible": false
 		},
 		"IRIDIUM 33": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24946U 97051C   10322.26276333  .00000073  00000-0  19719-4 0  3543",
-			"tle2": "2 24946  86.3898 211.5104 0009373 133.4741 226.7226 14.32548824689908",
+			"tle1": "1 24946U 97051C   11147.53073729  .00000181  00000-0  59582-4 0  5873",
+			"tle2": "2 24946  86.3865 132.0976 0005728 241.2959 118.7661 14.32593502717149",
 			"visible": false
 		},
 		"IRIDIUM 34": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24969U 97056E   10321.18475504 -.00001156  00000-0 -41999-3 0  2283",
-			"tle2": "2 24969  86.3946 243.4486 0002406  79.0150 281.1342 14.34209607687966",
+			"tle1": "1 24969U 97056E   11147.35052364 -.00000045  00000-0 -23306-4 0  4645",
+			"tle2": "2 24969  86.3970 163.6258 0002571  85.3580 274.7903 14.34213217715362",
 			"visible": false
 		},
 		"IRIDIUM 35": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24966U 97056B   10321.19109584 -.00000896  00000-0 -32694-3 0  2779",
-			"tle2": "2 24966  86.3948 243.3885 0002410  80.6921 279.4543 14.34212681687965",
+			"tle1": "1 24966U 97056B   11147.35685803  .00000017  00000-0 -83178-6 0  5174",
+			"tle2": "2 24966  86.3965 163.5601 0002548  81.5987 278.5490 14.34213027715369",
 			"visible": false
 		},
 		"IRIDIUM 36": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24967U 97056C   10321.48433305  .00000139  00000-0  42483-4 0  2229",
-			"tle2": "2 24967  86.3988 243.3423 0002310  83.4010 276.7457 14.34364167688150",
+			"tle1": "1 24967U 97056C   11147.48795564  .00000187  00000-0  59361-4 0  4536",
+			"tle2": "2 24967  86.3996 163.5792 0002445  83.7339 276.4139 14.34418143715538",
 			"visible": false
 		},
 		"IRIDIUM 37": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24968U 97056D   10321.16572584 -.00000985  00000-0 -35882-3 0  2447",
-			"tle2": "2 24968  86.3956 243.5149 0002376  79.5288 280.6189 14.34210013687962",
+			"tle1": "1 24968U 97056D   11147.40126255 -.00000017  00000-0 -13309-4 0  4776",
+			"tle2": "2 24968  86.3963 163.6623 0002589  84.0952 276.0536 14.34213556715371",
 			"visible": false
 		},
 		"IRIDIUM 38": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25043U 97069E   10321.29231998  .00000217  00000-0  69595-4 0  2558",
-			"tle2": "2 25043  86.3929 305.7875 0001635 103.2622 256.8758 14.34775978681897",
+			"tle1": "1 25043U 97069E   11147.52028442  .00000147  00000-0  44820-4 0  4872",
+			"tle2": "2 25043  86.3978 225.7590 0002226  51.1911 308.9484 14.34832453709310",
 			"visible": false
 		},
 		"IRIDIUM 39": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25042U 97069D   10321.05837301 -.00000099  00000-0 -42412-4 0  2291",
-			"tle2": "2 25042  86.3929 306.8821 0002220  85.6367 274.5081 14.34213884681720",
+			"tle1": "1 25042U 97069D   11147.36367152  .00000231  00000-0  75581-4 0  4587",
+			"tle2": "2 25042  86.3986 226.9283 0002367  84.5277 275.6189 14.34218457709146",
 			"visible": false
 		},
 		"IRIDIUM 4": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24796U 97020E   10321.08961475 -.00001151  00000-0 -41835-3 0  2754",
-			"tle2": "2 24796  86.3950 243.3163 0002303  81.0032 279.1420 14.34210313708636",
+			"tle1": "1 24796U 97020E   11147.39492283 -.00000009  00000-0 -10444-4 0  5107",
+			"tle2": "2 24796  86.3960 163.4233 0002598  83.0551 277.0947 14.34213322736052",
 			"visible": false
 		},
 		"IRIDIUM 40": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25041U 97069C   10321.47061248  .00000035  00000-0  53908-5 0  2533",
-			"tle2": "2 25041  86.3928 306.4946 0002496  85.1922 274.9573 14.34218072681802",
+			"tle1": "1 25041U 97069C   11147.35731890  .00000103  00000-0  29705-4 0  4898",
+			"tle2": "2 25041  86.3959 226.6822 0002471  90.3309 269.8136 14.34218548709168",
 			"visible": false
 		},
 		"IRIDIUM 41": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25040U 97069B   10321.02662891 -.00000539  00000-0 -19946-3 0  2256",
-			"tle2": "2 25040  86.3938 306.7189 0002068  79.8002 280.3449 14.34213109681728",
+			"tle1": "1 25040U 97069B   11147.33195316  .00000227  00000-0  74155-4 0  4607",
+			"tle2": "2 25040  86.3965 226.7342 0002458  81.3324 278.8152 14.34218902709144",
 			"visible": false
 		},
 		"IRIDIUM 42": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25077U 97077A   10321.04565865  .00000013  00000-0 -22742-5 0  2481",
-			"tle2": "2 25077  86.3931 306.7586 0002438  84.5731 275.5737 14.34217890677581",
+			"tle1": "1 25077U 97077A   11147.28121142  .00000179  00000-0  56846-4 0  4733",
+			"tle2": "2 25077  86.3957 226.8044 0002395  89.6541 270.4920 14.34218757704994",
 			"visible": false
 		},
 		"IRIDIUM 43": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25039U 97069A   10322.07950095 -.00000632  00000-0 -23287-3 0  2376",
-			"tle2": "2 25039  86.3935 306.3820 0002489  82.7596 277.3856 14.34213679681875",
+			"tle1": "1 25039U 97069A   11147.33829044  .00000104  00000-0  30244-4 0  4668",
+			"tle2": "2 25039  86.3981 226.8398 0002418  89.8832 270.2588 14.34218560709144",
 			"visible": false
 		},
 		"IRIDIUM 44": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25078U 97077B   10321.49309051  .00000170  00000-0  51088-4 0  7307",
-			"tle2": "2 25078  86.3949 301.2451 0001117 128.4717 231.6586 14.36664834678343",
+			"tle1": "1 25078U 97077B   11147.26014495  .00000170  00000-0  51067-4 0  9606",
+			"tle2": "2 25078  86.3993 221.1760 0002725  27.4734 332.6603 14.36731295705730",
 			"visible": false
 		},
 		"IRIDIUM 45": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25104U 97082A   10321.13346712 -.00000239  00000-0 -92434-4 0  1783",
-			"tle2": "2 25104  86.3967 180.2615 0002194  83.1418 276.9998 14.34219554675799",
+			"tle1": "1 25104U 97082A   11147.36906160  .00000141  00000-0  43371-4 0  4110",
+			"tle2": "2 25104  86.3940 100.3861 0002543  79.3439 280.8041 14.34218555703205",
 			"visible": false
 		},
 		"IRIDIUM 46": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24905U 97043C   10321.13981105 -.00000546  00000-0 -20221-3 0  2897",
-			"tle2": "2 24905  86.3977 180.5781 0002260  84.6111 275.5368 14.34216648693253",
+			"tle1": "1 24905U 97043C   11147.37540340  .00000140  00000-0  42826-4 0  5226",
+			"tle2": "2 24905  86.3941 100.7261 0002577  77.5981 282.5488 14.34218665720666",
 			"visible": false
 		},
 		"IRIDIUM 47": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25106U 97082C   10321.14615251 -.00000454  00000-0 -16931-3 0  1734",
-			"tle2": "2 25106  86.3967 180.1953 0002152  81.1694 278.9714 14.34218122675791",
+			"tle1": "1 25106U 97082C   11147.38175127  .00000144  00000-0  44341-4 0  4105",
+			"tle2": "2 25106  86.3935 100.3186 0002567  81.1168 279.0318 14.34218418703202",
 			"visible": false
 		},
 		"IRIDIUM 49": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25108U 97082E   10321.15883758 -.00000098  00000-0 -41923-4 0  1932",
-			"tle2": "2 25108  86.3968 180.2268 0002158  82.4006 277.7391 14.34220416675800",
+			"tle1": "1 25108U 97082E   11147.39443402  .00000200  00000-0  64363-4 0  4314",
+			"tle2": "2 25108  86.3944 100.3563 0002582  78.9490 281.2016 14.34218763703216",
 			"visible": false
 		},
 		"IRIDIUM 5": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24795U 97020D   10320.85494427  .00000295  00000-0  98139-4 0  4191",
-			"tle2": "2 24795  86.3942 243.8015 0002116 117.4358 242.7081 14.34225321708661",
+			"tle1": "1 24795U 97020D   11147.29978278  .00000016  00000-0 -12894-5 0  6535",
+			"tle2": "2 24795  86.3965 163.8548 0001461  60.3042 299.8304 14.34213455736102",
 			"visible": false
 		},
 		"IRIDIUM 50": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25172U 98010D   10322.36152197 -.00000281  00000-0 -10725-3 0  2249",
-			"tle2": "2 25172  86.3934 274.5326 0002384  77.4827 282.6560 14.34216467667368",
+			"tle1": "1 25172U 98010D   11147.34121984  .00000104  00000-0  30029-4 0  4595",
+			"tle2": "2 25172  86.3974 195.1481 0002511  88.6319 271.5206 14.34213683694590",
 			"visible": false
 		},
 		"IRIDIUM 51": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25262U 98018A   10321.14781630  .00000267  00000-0  73902-4 0  3219",
-			"tle2": "2 25262  86.4467 243.6246 0002339  77.4576 282.6893 14.42957242666066",
+			"tle1": "1 25262U 98018A   11147.33624681 -.00000037  00000-0 -17022-4 0  5590",
+			"tle2": "2 25262  86.4487 163.8133 0002659  83.1282 277.0223 14.42949781693636",
 			"visible": false
 		},
 		"IRIDIUM 52": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25169U 98010A   10321.39744469 -.00000499  00000-0 -18522-3 0  9753",
-			"tle2": "2 25169  86.3932 274.9604 0002393  80.9388 279.2026 14.34214766667242",
+			"tle1": "1 25169U 98010A   11147.42367047  .00000112  00000-0  33061-4 0  1991",
+			"tle2": "2 25169  86.3975 195.1375 0002532  88.7852 271.3636 14.34214135694627",
 			"visible": false
 		},
 		"IRIDIUM 53": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25173U 98010E   10321.19448133 -.00000079  00000-0 -35373-4 0  2082",
-			"tle2": "2 25173  86.3930 275.0288 0002502  80.1801 279.9641 14.34217363667201",
+			"tle1": "1 25173U 98010E   11147.43001691 -.00000196  00000-0 -77035-4 0  4410",
+			"tle2": "2 25173  86.3978 195.1193 0002419  89.1593 270.9902 14.34212312694619",
 			"visible": false
 		},
 		"IRIDIUM 54": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25171U 98010C   10321.07397400  .00000133  00000-0  40517-4 0  2004",
-			"tle2": "2 25171  86.3930 275.1026 0002425  79.6871 280.4593 14.34218615667343",
+			"tle1": "1 25171U 98010C   11147.37927653 -.00000279  00000-0 -10662-3 0  4331",
+			"tle2": "2 25171  86.3967 195.1643 0002418  89.9401 270.2112 14.34212019694766",
 			"visible": false
 		},
 		"IRIDIUM 55": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25272U 98019A   10321.80289773 -.00000772  00000-0 -28291-3 0  1564",
-			"tle2": "2 25272  86.3977 211.4967 0002304  76.1154 284.0177 14.34214570661589",
+			"tle1": "1 25272U 98019A   11147.34075664 -.00000021  00000-0 -14719-4 0  3988",
+			"tle2": "2 25272  86.3950 131.9473 0002537  79.7444 280.4044 14.34216477688891",
 			"visible": false
 		},
 		"IRIDIUM 56": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25170U 98010B   10322.15856107 -.00000948  00000-0 -34568-3 0  6005",
-			"tle2": "2 25170  86.3921 274.6999 0002464  79.6230 280.5234 14.34210921667331",
+			"tle1": "1 25170U 98010B   11147.41733190 -.00000179  00000-0 -71170-4 0  5798",
+			"tle2": "2 25170  86.3977 195.2027 0002469  89.4727 270.6801 14.34212549694605",
 			"visible": false
 		},
 		"IRIDIUM 57": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25273U 98019B   10321.77752896 -.00000973  00000-0 -35446-3 0  2027",
-			"tle2": "2 25273  86.3978 211.7076 0002323  79.3799 280.7582 14.34212944661582",
+			"tle1": "1 25273U 98019B   11147.45493034 -.00000012  00000-0 -11496-4 0  4380",
+			"tle2": "2 25273  86.3952 132.1077 0002617  81.3084 278.8418 14.34216167688910",
 			"visible": false
 		},
 		"IRIDIUM 58": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25274U 98019C   10321.78387179 -.00000964  00000-0 -35154-3 0    87",
-			"tle2": "2 25274  86.3980 211.8310 0002237  76.2954 283.8430 14.34213217661581",
+			"tle1": "1 25274U 98019C   11147.46127661 -.00000010  00000-0 -10584-4 0  2576",
+			"tle2": "2 25274  86.3946 132.2373 0002641  80.0196 280.1311 14.34216128688916",
 			"visible": false
 		},
 		"IRIDIUM 59": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25275U 98019D   10321.58090551 -.00000153  00000-0 -61568-4 0  8415",
-			"tle2": "2 25275  86.3987 211.8989 0002337  65.1480 294.9956 14.34215220661552",
+			"tle1": "1 25275U 98019D   11147.46761057  .00000015  00000-0 -17879-5 0   577",
+			"tle2": "2 25275  86.3979 132.2086 0002765  66.2914 293.8573 14.34216457688911",
 			"visible": false
 		},
 		"IRIDIUM 6": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24794U 97020C   10321.21012406 -.00000965  00000-0 -35189-3 0   573",
-			"tle2": "2 24794  86.3959 243.5148 0002062  81.0624 279.0833 14.34211086708632",
+			"tle1": "1 24794U 97020C   11147.37589404  .00000016  00000-0 -13288-5 0  2884",
+			"tle2": "2 24794  86.3964 163.6920 0002564  80.0044 280.1448 14.34213024736034",
 			"visible": false
 		},
 		"IRIDIUM 60": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25276U 98019E   10321.79655628 -.00000041  00000-0 -21543-4 0  2386",
-			"tle2": "2 25276  86.3962 211.5227 0002290  83.1038 277.0364 14.34219017661581",
+			"tle1": "1 25276U 98019E   11147.40420388 -.00000003  00000-0 -80608-5 0  4764",
+			"tle2": "2 25276  86.3941 131.9403 0002579  80.3323 279.8181 14.34215650688906",
 			"visible": false
 		},
 		"IRIDIUM 61": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25263U 98018B   10321.31160626 -.00001090  00000-0 -39625-3 0  1662",
-			"tle2": "2 25263  86.3946 243.4270 0002381  81.7435 278.4061 14.34210514662311",
+			"tle1": "1 25263U 98018B   11147.33784077 -.00000022  00000-0 -14888-4 0  3934",
+			"tle2": "2 25263  86.3963 163.6609 0002575  82.6647 277.4842 14.34213183689690",
 			"visible": false
 		},
 		"IRIDIUM 62": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25285U 98021A   10321.61837325 -.00000047  00000-0 -23714-4 0  2025",
-			"tle2": "2 25285  86.3963 148.5414 0002179  84.2498 275.8950 14.34216405660514",
+			"tle1": "1 25285U 98021A   11147.36560638 -.00001494  00000-0 -54090-3 0  4472",
+			"tle2": "2 25285  86.3951  68.8267 0002503  78.1290 282.0164 14.34209964687859",
 			"visible": false
 		},
 		"IRIDIUM 63": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25286U 98021B   10321.62471633 -.00000010  00000-0 -10782-4 0  2169",
-			"tle2": "2 25286  86.3946 148.6345 0002187  82.0256 278.1194 14.34216579660515",
+			"tle1": "1 25286U 98021B   11147.37197843  .00000228  00000-0  74384-4 0  4659",
+			"tle2": "2 25286  86.3963  68.9279 0002638  79.0396 281.1109 14.34218611687851",
 			"visible": false
 		},
 		"IRIDIUM 64": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25287U 98021C   10321.56129096 -.00000033  00000-0 -18835-4 0  1617",
-			"tle2": "2 25287  86.3950 148.5873 0002203  81.3404 278.8043 14.34216363660489",
+			"tle1": "1 25287U 98021C   11147.37829008 -.00001335  00000-0 -48382-3 0  4004",
+			"tle2": "2 25287  86.3950  68.8456 0002393  80.9664 279.1743 14.34211508687838",
 			"visible": false
 		},
 		"IRIDIUM 65": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25288U 98021D   10321.42809481  .00000031  00000-0  39207-5 0  1989",
-			"tle2": "2 25288  86.3946 148.5883 0001834  81.5199 278.6198 14.34216683660482",
+			"tle1": "1 25288U 98021D   11147.38463188 -.00001299  00000-0 -47095-3 0  4390",
+			"tle2": "2 25288  86.3942  68.7860 0002430  71.5204 288.6162 14.34211892687854",
 			"visible": false
 		},
 		"IRIDIUM 66": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25289U 98021E   10321.57397545 -.00000030  00000-0 -17760-4 0  1495",
-			"tle2": "2 25289  86.3948 148.4518 0002183  76.8552 283.2873 14.34216451660505",
+			"tle1": "1 25289U 98021E   11147.32120963 -.00001643  00000-0 -59386-3 0  3866",
+			"tle2": "2 25289  86.3945  68.7351 0002583  78.7088 281.4425 14.34208196687846",
 			"visible": false
 		},
 		"IRIDIUM 67": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25290U 98021F   10321.58031793 -.00000021  00000-0 -14499-4 0  9818",
-			"tle2": "2 25290  86.3943 148.5488 0002226  81.1790 278.9668 14.34216547660510",
+			"tle1": "1 25290U 98021F   11147.32755067 -.00001521  00000-0 -55058-3 0  2289",
+			"tle2": "2 25290  86.3947  68.8350 0002532  78.8954 281.2492 14.34210219687859",
 			"visible": false
 		},
 		"IRIDIUM 68": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25291U 98021G   10321.58666142  .00000050  00000-0  10678-4 0  1931",
-			"tle2": "2 25291  86.3948 148.6197 0002225  79.1183 281.0275 14.34216795660486",
+			"tle1": "1 25291U 98021G   11147.33389125 -.00000701  00000-0 -25732-3 0  4398",
+			"tle2": "2 25291  86.3954  68.9104 0002620  77.3685 282.7719 14.34215838687826",
 			"visible": false
 		},
 		"IRIDIUM 69": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25319U 98026A   10321.53124869  .00000165  00000-0  48745-4 0   232",
-			"tle2": "2 25319  86.4001 175.6826 0000888 116.1701 243.9592 14.37191845657620",
+			"tle1": "1 25319U 98026A   11147.50694020  .00000181  00000-0  54290-4 0  2521",
+			"tle2": "2 25319  86.3974  95.5828 0002998  31.1442 328.9932 14.37256670685050",
 			"visible": false
 		},
 		"IRIDIUM 7": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24793U 97020B   10321.14669787 -.00000940  00000-0 -34279-3 0  2556",
-			"tle2": "2 24793  86.3956 243.5610 0002394  78.9125 281.2342 14.34212071708625",
+			"tle1": "1 24793U 97020B   11147.45200826  .00000027  00000-0  24980-5 0  4895",
+			"tle2": "2 24793  86.3968 163.6831 0002550  83.7418 276.4086 14.34213366736044",
 			"visible": false
 		},
 		"IRIDIUM 70": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25342U 98032A   10321.82133530  .00000035  00000-0  54328-5 0  2156",
-			"tle2": "2 25342  86.3957 148.6521 0002084  78.0870 282.0561 14.34216805654628",
+			"tle1": "1 25342U 98032A   11147.35925023  .00000242  00000-0  79335-4 0  4692",
+			"tle2": "2 25342  86.3952  69.0378 0002726  77.4554 282.6957 14.34221739681935",
 			"visible": false
 		},
 		"IRIDIUM 71": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25320U 98026B   10321.15371704  .00000139  00000-0  39436-4 0  7240",
-			"tle2": "2 25320  86.3990 172.9637 0002311  25.5373 334.5946 14.37767372657881",
+			"tle1": "1 25320U 98026B   11147.47071068  .00000177  00000-0  52120-4 0  9588",
+			"tle2": "2 25320  86.3966  92.6096 0004589  60.6731 299.4925 14.37829611685374",
 			"visible": false
 		},
 		"IRIDIUM 72": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25343U 98032B   10321.80865116 -.00000003  00000-0 -81144-5 0  2015",
-			"tle2": "2 25343  86.3948 148.4261 0002196  83.3079 276.8365 14.34216569654622",
+			"tle1": "1 25343U 98032B   11147.34657816 -.00001410  00000-0 -51062-3 0  4498",
+			"tle2": "2 25343  86.3952  68.7998 0002496  75.0625 285.0813 14.34210621681933",
 			"visible": false
 		},
 		"IRIDIUM 73": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25344U 98032C   10321.55874291  .00000176  00000-0  42597-4 0   938",
-			"tle2": "2 25344  86.4408 137.2931 0002579  93.3317 266.8183 14.47236437659695",
+			"tle1": "1 25344U 98032C   11147.52322026  .00000198  00000-0  48669-4 0  3388",
+			"tle2": "2 25344  86.4431  56.8200 0001782  64.8721 295.2666 14.47315404687317",
 			"visible": false
 		},
 		"IRIDIUM 74": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25345U 98032D   10321.58367047 -.00003283  00000-0 -98959-3 0  2318",
-			"tle2": "2 25345  86.4461 148.7115 0002345  77.3963 282.7904 14.42932550656145",
+			"tle1": "1 25345U 98032D   11147.28733864  .00000224  00000-0  61109-4 0  4709",
+			"tle2": "2 25345  86.4457  69.0322 0002603  80.7198 279.4298 14.42949371683643",
 			"visible": false
 		},
 		"IRIDIUM 75": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25346U 98032E   10321.60568887 -.00000068  00000-0 -31391-4 0  2302",
-			"tle2": "2 25346  86.3951 148.6769 0002177  80.9130 279.2313 14.34216216655163",
+			"tle1": "1 25346U 98032E   11147.35291941 -.00001155  00000-0 -41947-3 0  4706",
+			"tle2": "2 25346  86.3960  68.9704 0002387  78.3648 281.7729 14.34212898682503",
 			"visible": false
 		},
 		"IRIDIUM 76": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25432U 98048B   10321.81846855 -.00000476  00000-0 -17704-3 0   865",
-			"tle2": "2 25432  86.3977 179.9667 0002602  66.6213 293.5231 14.34217457641124",
+			"tle1": "1 25432U 98048B   11147.35638429  .00000158  00000-0  49301-4 0  3303",
+			"tle2": "2 25432  86.3938 100.3905 0003134  88.1666 271.9890 14.34218373668438",
 			"visible": false
 		},
 		"IRIDIUM 77": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25471U 98051E   10321.76871133 -.00000404  00000-0 -15129-3 0  3226",
-			"tle2": "2 25471  86.3933 306.2697 0001980  53.2260 306.9109 14.34214957643553",
+			"tle1": "1 25471U 98051E   11147.30657981 -.00000000  00000-0 -72157-5 0  5631",
+			"tle2": "2 25471  86.3964 226.5917 0003518  77.9328 282.2222 14.34218078670867",
 			"visible": false
 		},
 		"IRIDIUM 8": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24792U 97020A   10320.94373425 -.00001144  00000-0 -41584-3 0  2603",
-			"tle2": "2 24792  86.3942 243.4899 0002372  82.5973 277.5492 14.34210617708599",
+			"tle1": "1 24792U 97020A   11147.17927120  .00000051  00000-0  11067-4 0  4861",
+			"tle2": "2 24792  86.3961 163.6318 0002598  84.3744 275.7753 14.34213869736004",
 			"visible": false
 		},
 		"IRIDIUM 80": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25469U 98051C   10321.48330340 -.00000045  00000-0 -23036-4 0  1543",
-			"tle2": "2 25469  86.3930 306.5691 0002474  83.1928 276.9553 14.34217461638316",
+			"tle1": "1 25469U 98051C   11147.37000888  .00000183  00000-0  58303-4 0  3963",
+			"tle2": "2 25469  86.3965 226.7653 0002436  91.6643 268.4826 14.34218715665672",
 			"visible": false
 		},
 		"IRIDIUM 81": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25468U 98051B   10321.71161670 -.00000269  00000-0 -10297-3 0  1469",
-			"tle2": "2 25468  86.3929 306.3104 0002536  84.0518 276.0967 14.34213365638346",
+			"tle1": "1 25468U 98051B   11147.31926624  .00000176  00000-0  55716-4 0  3902",
+			"tle2": "2 25468  86.3957 226.6132 0002324  91.6103 268.5352 14.34218223665668",
 			"visible": false
 		},
 		"IRIDIUM 82": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25467U 98051A   10321.50866909  .00000079  00000-0  21223-4 0  3227",
-			"tle2": "2 25467  86.3939 306.6046 0001724  93.5216 266.6184 14.34218048642098",
+			"tle1": "1 25467U 98051A   11147.32561133  .00000260  00000-0  85699-4 0  5585",
+			"tle2": "2 25467  86.3967 226.8363 0002136  66.6122 293.5314 14.34219121669444",
 			"visible": false
 		},
 		"IRIDIUM 83": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25531U 98066E   10321.58138290  .00000140  00000-0  42982-4 0  1589",
-			"tle2": "2 25531  86.3922 274.7038 0002483  80.0391 280.1084 14.34218797629845",
+			"tle1": "1 25531U 98066E   11147.46807136  .00000134  00000-0  40613-4 0  4052",
+			"tle2": "2 25531  86.3969 194.9307 0002548  88.1385 272.0107 14.34213789657205",
 			"visible": false
 		},
 		"IRIDIUM 84": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25530U 98066D   10321.82874280 -.00000295  00000-0 -11227-3 0   276",
-			"tle2": "2 25530  86.3918 274.5684 0002450  77.3671 282.7830 14.34212517632528",
+			"tle1": "1 25530U 98066D   11147.22705148  .00000152  00000-0  47038-4 0  2758",
+			"tle2": "2 25530  86.3959 194.9922 0002524  87.6107 272.5366 14.34213859659815",
 			"visible": false
 		},
 		"IRIDIUM 86": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25528U 98066B   10321.79706565  .00000221  00000-0  71706-4 0  3728",
-			"tle2": "2 25528  86.3913 274.4620 0001782  69.2204 290.9189 14.34217817634885",
+			"tle1": "1 25528U 98066B   11147.40464657 -.00000047  00000-0 -23849-4 0  6205",
+			"tle2": "2 25528  86.3975 194.7950 0002863  73.6001 286.5536 14.34213016662209",
 			"visible": false
 		},
 		"IRIDIUM 90": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27373U 02005B   10321.84677649  .00000314  00000-0  87852-4 0  7155",
-			"tle2": "2 27373  86.4431 274.4536 0007460  75.3433 284.8608 14.42949458464788",
+			"tle1": "1 27373U 02005B   11147.41115268  .00000147  00000-0  37903-4 0  9562",
+			"tle2": "2 27373  86.4480 194.8279 0006135 139.0777 221.0878 14.42949619492263",
 			"visible": false
 		},
 		"IRIDIUM 91": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27372U 02005A   10321.77118576 -.00000553  00000-0 -20439-3 0  7441",
-			"tle2": "2 27372  86.3997 211.9132 0004170 141.5442 218.5957 14.34215766467145",
+			"tle1": "1 27372U 02005A   11147.44858445 -.00000009  00000-0 -10365-4 0  9949",
+			"tle2": "2 27372  86.3963 132.3409 0001211 295.3990  64.7089 14.34215581494478",
 			"visible": false
 		},
 		"IRIDIUM 911": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24842U 97030G   10321.42682100  .00000199  00000-0  53042-4 0  9345",
-			"tle2": "2 24842  86.4433 277.4752 0015967 135.2407 225.0089 14.43284743706036",
+			"tle1": "1 24842U 97030G   11147.49773278  .00000142  00000-0  36054-4 0  1632",
+			"tle2": "2 24842  86.4494 197.5730 0012488 227.0374 132.9780 14.43359892733592",
 			"visible": false
 		},
 		"IRIDIUM 914": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24836U 97030A   10321.37877245  .00000195  00000-0  58523-4 0  8410",
-			"tle2": "2 24836  86.3907 266.3474 0004114  74.7477 285.4178 14.37513397703464",
+			"tle1": "1 24836U 97030A   11147.52100613  .00000145  00000-0  41866-4 0   770",
+			"tle2": "2 24836  86.3953 186.0069 0002906 107.3650 252.7871 14.37570584730925",
 			"visible": false
 		},
 		"IRIDIUM 920": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24871U 97034C   10321.51628133  .00000222  00000-0  66572-4 0  8895",
-			"tle2": "2 24871  86.3942 298.1482 0010678 330.7895  29.2717 14.38151051700720",
+			"tle1": "1 24871U 97034C   11147.29508267  .00000060  00000-0  13011-4 0  1200",
+			"tle2": "2 24871  86.4005 217.9086 0014149  58.2957 301.9617 14.38212795728146",
 			"visible": false
 		},
 		"IRIDIUM 921": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24873U 97034E   10321.47106845  .00000711  00000-0  58160-4 0  2760",
-			"tle2": "2 24873  86.3829 111.0614 0010958 110.2366 250.0046 14.97610432726760",
+			"tle1": "1 24873U 97034E   11147.41435212  .00001008  00000-0  82596-4 0  5341",
+			"tle2": "2 24873  86.3887  22.5314 0009465 131.6765 228.5281 14.98044170755346",
 			"visible": false
 		},
 		"IRIDIUM 94": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27374U 02005C   10321.79321633 -.00003479  00000-0 -63735-3 0  8262",
-			"tle2": "2 27374  86.5814 211.4151 0001847  93.2504 266.9505 14.66217185469154",
+			"tle1": "1 27374U 02005C   11147.33629248  .00000154  00000-0  23764-4 0   820",
+			"tle2": "2 27374  86.5762 131.8895 0002697  82.5864 277.5654 14.66239736497071",
 			"visible": false
 		},
 		"IRIDIUM 95": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27375U 02005D   10321.73947443 -.00001060  00000-0 -38578-3 0  7181",
-			"tle2": "2 27375  86.3982 211.7259 0002264  74.6712 285.4723 14.34211926466426",
+			"tle1": "1 27375U 02005D   11147.41688040  .00000034  00000-0  52200-5 0  9559",
+			"tle2": "2 27375  86.3960 132.1516 0002642  83.0587 277.0918 14.34215932493758",
 			"visible": false
 		},
 		"IRIDIUM 96": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27376U 02005E   10322.14067587 -.00002678  00000-0 -49162-3 0  8155",
-			"tle2": "2 27376  86.5800 211.2097 0002389 114.6155 245.5600 14.66218852469207",
+			"tle1": "1 27376U 02005E   11147.41078737  .00000204  00000-0  32792-4 0   784",
+			"tle2": "2 27376  86.5757 131.7943 0002733  80.3456 279.8083 14.66241533497084",
 			"visible": false
 		},
 		"IRIDIUM 97": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27450U 02031A   10321.82536079 -.00001146  00000-0 -41651-3 0  6251",
-			"tle2": "2 27450  86.3944 243.3648 0004209 128.6588 231.5013 14.34210168445757",
+			"tle1": "1 27450U 02031A   11147.36320656 -.00000005  00000-0 -89755-5 0  8714",
+			"tle2": "2 27450  86.3967 163.7943 0000643 247.6274 112.4852 14.34213061473065",
 			"visible": false
 		},
 		"IRIDIUM 98": 
 		{
+			"comms": [],
 			"groups": ["iridium", "communications"],
 			"hintColor": [0.21, 0, 0.71],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27451U 02031B   10321.80267022 -.00000555  00000-0 -17224-3 0  6734",
-			"tle2": "2 27451  86.4471 306.7495 0004084 144.0524 216.0956 14.42945945445639",
+			"tle1": "1 27451U 02031B   11147.36715445  .00000243  00000-0  66716-4 0  9218",
+			"tle2": "2 27451  86.4497 227.1419 0001244 275.1727  84.9332 14.42950071473115",
 			"visible": false
 		},
 		"ISIS 1": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 03669U 69009A   10322.23909660  .00000106  00000-0  70296-4 0  1404",
-			"tle2": "2 03669  88.4237  54.0115 1714151 197.3102 156.1725 11.28887859717770",
+			"tle1": "1 03669U 69009A   11148.05312523  .00000074  00000-0  42395-4 0  2399",
+			"tle2": "2 03669  88.4291  32.7972 1714631 173.1089 189.7234 11.28907564739309",
 			"visible": true
 		},
 		"ISS (ZARYA)": 
@@ -2104,40 +2628,43 @@
 			"description": "The International Space Station",
 			"groups": ["scientific", "amateur", "visual"],
 			"hintColor": [1, 1, 1],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": true,
-			"tle1": "1 25544U 98067A   10322.29145833  .00018412  00000-0  13679-3 0  2980",
-			"tle2": "2 25544  51.6439 161.9899 0007603 212.9096 126.3632 15.72878646687703",
+			"tle1": "1 25544U 98067A   11148.14843765  .00026129  00000-0  17083-3 0  4293",
+			"tle2": "2 25544  51.6513 263.4932 0004063 338.1853  83.1660 15.75631637717751",
 			"visible": true
 		},
 		"ITAMSAT (IO-26)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 22826U 93061D   10321.00992877  .00000078  00000-0  47117-4 0  4150",
-			"tle2": "2 22826  98.4994 265.6853 0008998 169.0185 191.1195 14.29574570893993",
+			"tle1": "1 22826U 93061D   11147.57300780  .00000066  00000-0  42754-4 0  5706",
+			"tle2": "2 22826  98.5250  92.9345 0008764 337.2978  22.7814 14.29609763921369",
 			"visible": false
 		},
 		"JAS-1 (FO-12)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 16909U 86061B   10322.29450936 -.00000083  00000-0  10000-3 0  8098",
-			"tle2": "2 16909  50.0179   6.0288 0011533  88.4133 271.8018 12.44454211103619",
+			"tle1": "1 16909U 86061B   11147.22975501 -.00000083  00000-0  10000-3 0  8974",
+			"tle2": "2 16909  50.0138 142.1183 0011117 208.7593 151.2630 12.44455449127267",
 			"visible": false
 		},
 		"JAS-1B (FO-20)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 20480U 90013C   10322.07562559 -.00000019  00000-0  20408-4 0  6204",
-			"tle2": "2 20480  99.0162 150.2991 0540839  75.1009 290.9320 12.83366094973467",
+			"tle1": "1 20480U 90013C   11147.99412228 -.00000034  00000-0 -19512-5 0  7909",
+			"tle2": "2 20480  99.0331 304.9500 0540604   2.3567 357.9902 12.83368860997953",
 			"visible": false
 		},
 		"JAS-2 (FO-29)": 
@@ -2155,110 +2682,109 @@
 			}],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24278U 96046B   10321.48126491 -.00000009  00000-0  23478-4 0  4410",
-			"tle2": "2 24278  98.5189 129.4702 0351430  86.1739 277.9499 13.52954547703833",
+			"tle1": "1 24278U 96046B   11147.42261177  .00000098  00000-0  13839-3 0  5802",
+			"tle2": "2 24278  98.5433 294.3483 0350034 311.1709  45.9719 13.52961668729658",
 			"visible": false
 		},
 		"JB-3 2 (ZY 2B)": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27550U 02049A   10322.08008813  .00002753  00000-0  10974-3 0  1937",
-			"tle2": "2 27550  97.0698 334.1567 0009898 128.0879 315.9007 15.25948630448574",
+			"tle1": "1 27550U 02049A   11148.08568749  .00002691  00000-0  10268-3 0  7723",
+			"tle2": "2 27550  97.0625 154.9214 0008482 162.6111 228.8567 15.27437306477718",
 			"visible": true
 		},
 		"KITSAT 1 (KO-23)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 22077U 92052B   10321.43991825 -.00000037  00000-0  10000-3 0   899",
-			"tle2": "2 22077  66.0860 321.2428 0004414 344.2287  15.8587 12.86455251858184",
+			"tle1": "1 22077U 92052B   11147.52654554 -.00000037  00000-0  10000-3 0  1757",
+			"tle2": "2 22077  66.0802 281.0352 0013396 294.4933  65.4688 12.86458446882765",
 			"visible": false
 		},
 		"KITSAT 2 (KO-25)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-17T03:55:17,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 22828U 93061F   10320.86708201  .00000069  00000-0  43531-4 0  6160",
-			"tle2": "2 22828  98.4940 265.3261 0010466 143.8135 216.3751 14.29866295862266",
+			"tle1": "1 22828U 93061F   11147.46135995 -.00000022  00000-0  83395-5 0  7702",
+			"tle2": "2 22828  98.5183  92.5524 0009135 307.5131  52.5220 14.29896291889645",
 			"visible": false
 		},
 		"KKS-1": 
 		{
+			"comms": [],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 33499U 09002H   10321.33222290  .00000245  00000-0  48105-4 0  2681",
-			"tle2": "2 33499  98.0703  69.9873 0011013 109.0431 251.1978 14.70877470 97467",
+			"tle1": "1 33499U 09002H   11147.54944776  .00000233  00000-0  46007-4 0  4320",
+			"tle2": "2 33499  98.0820 259.5533 0009286 220.1450 139.9073 14.71033713125570",
 			"visible": false
 		},
 		"KORONAS-FOTON": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 33504U 09003A   10321.87828649  .00001538  00000-0  10425-3 0   168",
-			"tle2": "2 33504  82.4752  79.5276 0017520 105.5054 254.8107 15.05639476 98747",
+			"tle1": "1 33504U 09003A   11147.82441801  .00000519  00000-0  33540-4 0  5731",
+			"tle2": "2 33504  82.4789 253.2977 0016140 173.7332 336.8063 15.05987503127471",
 			"visible": true
 		},
 		"LUSAT (LO-19)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 20442U 90005G   10321.05714397  .00000035  00000-0  28563-4 0  9557",
-			"tle2": "2 20442  98.3157 278.2962 0012776  68.9457 291.3095 14.32112248 87434",
+			"tle1": "1 20442U 90005G   11147.00216940  .00000056  00000-0  36514-4 0  1099",
+			"tle2": "2 20442  98.3461 101.7637 0011167 216.5979 143.4437 14.32146442114761",
 			"visible": false
 		},
-		"M-5 R/B": 
-		{
-			"groups": ["visual"],
-			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
-			"orbitVisible": false,
-			"tle1": "1 28942U 06005D   10322.19880918  .00118088  75862-5  30580-3 0  4430",
-			"tle2": "2 28942  98.1135 202.7634 0075444  88.5137 272.4741 15.90201766267205",
-			"visible": true
-		},
 		"METEOR 1-1": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 03835U 69029A   10321.05311773  .00012473  00000-0  20292-3 0  5338",
-			"tle2": "2 03835  81.1572 132.3689 0005720 198.9752 161.1282 15.52510715277595",
+			"tle1": "1 03835U 69029A   11148.24534202  .00014419  00000-0  19257-3 0  7053",
+			"tle2": "2 03835  81.1643 255.4095 0005553 237.6554 122.4174 15.57903962307451",
 			"visible": true
 		},
 		"METEOR PRIRODA": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 12585U 81065A   10321.12239897  .00000327  00000-0  25285-4 0  7962",
-			"tle2": "2 12585  97.3434 351.0537 0020833  98.9678 261.3886 15.07651630598583",
+			"tle1": "1 12585U 81065A   11147.18444131  .00000703  00000-0  49395-4 0  9434",
+			"tle2": "2 12585  97.3237 173.3462 0019689 159.8335 200.3675 15.08016875627376",
 			"visible": true
 		},
 		"MIDORI II (ADEOS-II)": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27597U 02056A   10321.17351196  .00000056  00000-0  40593-4 0  2958",
-			"tle2": "2 27597  98.4054  11.9955 0000539 126.5243 233.5987 14.26235105412623",
+			"tle1": "1 27597U 02056A   11147.76376332  .00000053  00000-0  39369-4 0  4485",
+			"tle2": "2 27597  98.3760 195.5716 0001816  33.9693 326.1603 14.26278231439933",
 			"visible": true
 		},
 		"MOZHAYETS 4 (RS-22)": 
@@ -2271,79 +2797,86 @@
 			}],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27939U 03042A   10322.09929840  .00000097  00000-0  27496-4 0  7321",
-			"tle2": "2 27939  97.8683 180.8630 0012676 296.1400  63.8501 14.63477325381460",
+			"tle1": "1 27939U 03042A   11148.05496378  .00000214  00000-0  49739-4 0  2970",
+			"tle2": "2 27939  97.8499   3.0139 0014488  51.9038 308.3497 14.63585122409391",
 			"visible": false
 		},
 		"NCUBE-2": 
 		{
+			"comms": [],
 			"groups": [],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28897U 05043H   10321.63489792  .00000316  00000-0  74917-4 0  2985",
-			"tle2": "2 28897  97.9903 200.7239 0017361 161.5173 198.6707 14.60156296261678",
+			"tle1": "1 28897U 05043H   11148.09057430  .00000294  00000-0  70052-4 0  4559",
+			"tle2": "2 28897  97.9680  25.1432 0016195 286.2683  73.6737 14.60301038289614",
 			"visible": false
 		},
 		"NOAA 1": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 04793U 70106A   10321.51570230 -.00000031  00000-0  10000-3 0  7073",
-			"tle2": "2 04793 102.0982 327.0657 0031942 171.7426 188.4176 12.53942666827886",
+			"tle1": "1 04793U 70106A   11147.51372183 -.00000031  00000-0  10000-3 0  9046",
+			"tle2": "2 04793 102.0957 161.7738 0032189 168.2309 191.9520 12.53945283851827",
 			"visible": false
 		},
 		"NOAA 10": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 16969U 86073A   10321.17262495  .00000126  00000-0  69155-4 0  2776",
-			"tle2": "2 16969  98.6436 348.6009 0012799 122.3175 237.9242 14.27434491257404",
+			"tle1": "1 16969U 86073A   11147.32174937  .00000084  00000-0  51934-4 0  5135",
+			"tle2": "2 16969  98.6191 177.3916 0011418 288.4724  71.5227 14.27462007284675",
 			"visible": false
 		},
 		"NOAA 11": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 19531U 88089A   10321.26592249 -.00000175  00000-0 -67832-4 0  2862",
-			"tle2": "2 19531  98.7645  47.6506 0012368  71.7824 288.4684 14.14941725142787",
+			"tle1": "1 19531U 88089A   11147.48093028 -.00000109  00000-0 -33972-4 0  5154",
+			"tle2": "2 19531  98.7507 235.3350 0010369 247.3746 112.6298 14.14916118169821",
 			"visible": false
 		},
 		"NOAA 12": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 21263U 91032A   10321.49047641  .00000070  00000-0  48369-4 0  7787",
-			"tle2": "2 21263  98.7618 334.6087 0013381  81.9455 278.3246 14.25667458 14245",
+			"tle1": "1 21263U 91032A   11147.52388001  .00000044  00000-0  37200-4 0   119",
+			"tle2": "2 21263  98.7503 165.4036 0011363 247.0677 112.9304 14.25712541 41467",
 			"visible": false
 		},
 		"NOAA 13": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 22739U 93050A   10321.24821492  .00000072  00000-0  63093-4 0  3111",
-			"tle2": "2 22739  98.8290  39.7393 0009333 169.4384 190.6981 14.12252569890084",
+			"tle1": "1 22739U 93050A   11147.46689692  .00000056  00000-0  54098-4 0  5328",
+			"tle2": "2 22739  98.8130 227.8858 0009944 356.9619   3.1492 14.12272162917070",
 			"visible": false
 		},
 		"NOAA 14": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 23455U 94089A   10321.50310851 -.00000009  00000-0  18679-4 0  2672",
-			"tle2": "2 23455  98.8690  41.0988 0009574 155.7636 204.3986 14.13800053819161",
+			"tle1": "1 23455U 94089A   11147.51243684 -.00000013  00000-0  16707-4 0  4968",
+			"tle2": "2 23455  98.8505 230.3520 0009443 344.3609  15.7272 14.13819508846158",
 			"visible": false
 		},
 		"NOAA 15": 
@@ -2356,20 +2889,21 @@
 			}],
 			"groups": ["scientific", "weather"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": true,
-			"tle1": "1 25338U 98030A   10321.02856717 -.00000070  00000-0 -11232-4 0  5969",
-			"tle2": "2 25338  98.6355 305.3379 0010607 355.3269   4.7811 14.24865729650512",
+			"tle1": "1 25338U 98030A   11147.31002986 -.00000043  00000-0  29127-6 0  8280",
+			"tle2": "2 25338  98.6527 133.7403 0011127 148.4877 211.6964 14.24915662677753",
 			"visible": true
 		},
 		"NOAA 16": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": true,
-			"tle1": "1 26536U 00055A   10321.08138649 -.00000235  00000-0 -10191-3 0   727",
-			"tle2": "2 26536  99.1631 342.0995 0009799 268.4645  91.5406 14.12583980523415",
+			"tle1": "1 26536U 00055A   11147.32393577 -.00000085  00000-0 -21076-4 0  3107",
+			"tle2": "2 26536  99.1403 177.4412 0011490  91.6162 268.6307 14.12619478550416",
 			"visible": true
 		},
 		"NOAA 17": 
@@ -2382,10 +2916,10 @@
 			}],
 			"groups": ["scientific", "weather"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": true,
-			"tle1": "1 27453U 02032A   10321.43436517  .00000240  00000-0  12225-3 0   642",
-			"tle2": "2 27453  98.4118   5.5500 0012514  52.5105 307.7209 14.24210439436517",
+			"tle1": "1 27453U 02032A   11147.31165925  .00000001  00000-0  18473-4 0  3020",
+			"tle2": "2 27453  98.3797 187.9784 0011186 206.3811 153.6813 14.24274433463686",
 			"visible": true
 		},
 		"NOAA 18": 
@@ -2398,10 +2932,10 @@
 			}],
 			"groups": ["scientific", "weather"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": true,
-			"tle1": "1 28654U 05018A   10321.42635693  .00000059  00000-0  57248-4 0  5545",
-			"tle2": "2 28654  98.9688 267.3742 0014162 345.0000  15.0750 14.11407769283058",
+			"tle1": "1 28654U 05018A   11147.33017009  .00000147  00000-0  10573-3 0  7827",
+			"tle2": "2 28654  98.9941  98.4278 0014483 160.2445 199.9288 14.11477664309983",
 			"visible": true
 		},
 		"NOAA 19": 
@@ -2414,190 +2948,208 @@
 			}],
 			"groups": ["scientific", "weather"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": true,
-			"tle1": "1 33591U 09005A   10321.44783745  .00000227  00000-0  15015-3 0  7493",
-			"tle2": "2 33591  98.8043 260.4132 0013574 213.0459 146.9851 14.11104467 91527",
+			"tle1": "1 33591U 09005A   11147.32279065  .00000339  00000-0  21196-3 0  9732",
+			"tle2": "2 33591  98.8245  87.8275 0014797  38.2046 322.0182 14.11169227118447",
 			"visible": true
 		},
 		"NOAA 2": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 06235U 72082A   10321.49393921 -.00000027  00000-0  10000-3 0  8063",
-			"tle2": "2 06235 101.3931 323.4227 0003806 350.9491   9.1515 12.53010884742384",
+			"tle1": "1 06235U 72082A   11147.47665145 -.00000027  00000-0  10000-3 0    37",
+			"tle2": "2 06235 101.3996 146.6689 0003737 342.0135  18.0805 12.53014365766309",
 			"visible": false
 		},
 		"NOAA 3": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 06920U 73086A   10321.41292643 -.00000030  00000-0  10000-3 0  6983",
-			"tle2": "2 06920 101.6981 329.2090 0006331 275.1973  84.8369 12.40310516676524",
+			"tle1": "1 06920U 73086A   11147.49383581 -.00000030  00000-0  10000-3 0  8959",
+			"tle2": "2 06920 101.6980 152.9217 0006095 274.6671  85.3698 12.40314679700210",
 			"visible": false
 		},
 		"NOAA 4": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 07529U 74089A   10321.48680804 -.00000027  00000-0  10000-3 0  7099",
-			"tle2": "2 07529 101.4105 331.4986 0008973  24.1751 335.9744 12.53059486646967",
+			"tle1": "1 07529U 74089A   11147.54197751 -.00000027  00000-0  10000-3 0  9055",
+			"tle2": "2 07529 101.4070 155.0313 0009159  12.1504 347.9789 12.53062396670897",
 			"visible": false
 		},
 		"NOAA 5": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 09057U 76077A   10321.43914245 -.00000030  00000-0  10000-3 0  5867",
-			"tle2": "2 09057 101.8446 354.0440 0009641 104.2166 255.9964 12.37799975550602",
+			"tle1": "1 09057U 76077A   11147.50376539 -.00000030  00000-0  10000-3 0  7839",
+			"tle2": "2 09057 101.8162 178.9220 0009956 106.5074 253.7082 12.37792410574248",
 			"visible": false
 		},
 		"NOAA 6": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 11416U 79057A   10321.51567703  .00000081  00000-0  45896-4 0  4666",
-			"tle2": "2 11416  98.4020 325.3074 0010309 161.8160 198.3395 14.32016389635894",
+			"tle1": "1 11416U 79057A   11147.47169307  .00000096  00000-0  51598-4 0  7010",
+			"tle2": "2 11416  98.4066 150.3112 0010012 326.6326  33.4233 14.32077603663223",
 			"visible": false
 		},
 		"NOAA 7": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 12553U 81059A   10321.30478631  .00000012  00000-0  27856-4 0  5887",
-			"tle2": "2 12553  98.7229 267.9779 0010757 272.8350  87.1596 14.16797537518896",
+			"tle1": "1 12553U 81059A   11147.47565754  .00000011  00000-0  27416-4 0  8159",
+			"tle2": "2 12553  98.7502  95.7668 0012466  83.6024 276.6570 14.16817530545960",
 			"visible": false
 		},
 		"NOAA 8": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 13923U 83022A   10321.53367186  .00000015  00000-0  23440-4 0  4919",
-			"tle2": "2 13923  98.5122 344.5909 0016305  30.9849 329.2305 14.27755533438819",
+			"tle1": "1 13923U 83022A   11147.49999944  .00000013  00000-0  22588-4 0  7164",
+			"tle2": "2 13923  98.4958 170.4876 0015128 184.8414 175.2632 14.27783906466068",
 			"visible": false
 		},
 		"NOAA 9": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
 			"hintColor": [0.08, 0.33, 0.74],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 15427U 84123A   10321.33545961  .00000299  00000-0  17461-3 0  3536",
-			"tle2": "2 15427  98.4903 297.8776 0015171  10.3026 349.8464 14.15372720338258",
+			"tle1": "1 15427U 84123A   11147.48720342  .00000025  00000-0  33832-4 0  5908",
+			"tle2": "2 15427  98.5136 120.2286 0014880 173.4542 186.6837 14.15395557365290",
 			"visible": false
 		},
 		"OAO 2": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 03597U 68110A   10321.72752615  .00000057  00000-0  21497-4 0  4839",
-			"tle2": "2 03597  34.9932  86.1604 0004950 101.0658 259.0600 14.44912188209993",
+			"tle1": "1 03597U 68110A   11147.30943052  .00000029  00000-0  13388-4 0  6311",
+			"tle2": "2 03597  34.9931 106.1863 0005476 193.1167 166.9381 14.44947194237575",
 			"visible": true
 		},
 		"OAO 3 (COPERNICUS)": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 06153U 72065A   10321.51765307  .00000097  00000-0  25864-4 0  6235",
-			"tle2": "2 06153  35.0087   5.4801 0007562 291.9918  67.9976 14.56630592 30061",
+			"tle1": "1 06153U 72065A   11147.07067551  .00000074  00000-0  20891-4 0  7757",
+			"tle2": "2 06153  35.0091   5.6438 0006907  34.0165 326.0971 14.56679000 57864",
 			"visible": true
 		},
 		"OKEAN-3": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 21397U 91039A   10321.27785471  .00000586  00000-0  62483-4 0  1417",
-			"tle2": "2 21397  82.5222 252.1940 0018921 329.2686  30.7426 14.87054100 51867",
+			"tle1": "1 21397U 91039A   11146.89733850  .00000468  00000-0  49031-4 0  3173",
+			"tle2": "2 21397  82.5233  72.7157 0021576  53.1341 307.1850 14.87245284 80191",
 			"visible": true
 		},
 		"OKEAN-O": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25860U 99039A   10321.86880324  .00000206  00000-0  39018-4 0  1521",
-			"tle2": "2 25860  97.8548 289.5255 0000989  43.0483 317.0802 14.73683626609538",
+			"tle1": "1 25860U 99039A   11147.99741142  .00000102  00000-0  23034-4 0  3186",
+			"tle2": "2 25860  97.8824 115.0001 0001952  60.2442 299.8960 14.73782864637687",
 			"visible": true
 		},
 		"OPAL (OO-38)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 26063U 00004C   10322.13798430  .00000041  00000-0  34230-4 0  9557",
-			"tle2": "2 26063 100.1940 208.9542 0036576 240.0940 119.6607 14.35914340566427",
+			"tle1": "1 26063U 00004C   11147.85045299  .00000034  00000-0  31680-4 0  1077",
+			"tle2": "2 26063 100.1894  74.0895 0037299  63.3556 297.1434 14.35947609593794",
 			"visible": false
 		},
 		"OPS 8180 (RADCAT)": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 06212U 72076A   10321.38345345  .00009040  00000-0  29119-3 0  1535",
-			"tle2": "2 06212  98.5492  53.9471 0002875  32.0472 328.0960 15.32488642202127",
+			"tle1": "1 06212U 72076A   11147.42372329  .00009091  00000-0  25507-3 0  3118",
+			"tle2": "2 06212  98.5557 275.0161 0003499  98.0887 262.0691 15.36861539231413",
 			"visible": true
 		},
 		"ORBVIEW 2 (SEASTAR)": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24883U 97037A   10321.92127363 -.00000047  00000-0 -20746-5 0  2823",
-			"tle2": "2 24883  98.3516  89.3307 0002846  44.1283 316.0128 14.32204846707763",
+			"tle1": "1 24883U 97037A   11146.94501757  .00000042  00000-0  31333-4 0  4394",
+			"tle2": "2 24883  98.3752 272.6175 0002480 160.9176 199.2106 14.32256560734966",
 			"visible": true
 		},
 		"OSCAR 3 (OSCAR III)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 01293U 65016F   10321.74245229  .00000151  00000-0  12738-3 0  9457",
-			"tle2": "2 01293  70.0713 130.6137 0019337 205.2497 154.7683 14.04828492332631",
+			"tle1": "1 01293U 65016F   11148.20011178  .00000073  00000-0  78898-4 0   948",
+			"tle2": "2 01293  70.0706  76.7318 0019567 297.8660  62.0476 14.04898020359520",
 			"visible": false
 		},
 		"OSCAR 5 (AO-5)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-17T03:55:17,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 04321U 70008B   10320.53276537 -.00000031  00000-0  10000-3 0  3970",
-			"tle2": "2 04321 102.0980 345.9182 0027663  80.8621 279.5575 12.52161027865515",
+			"tle1": "1 04321U 70008B   11147.52160026 -.00000031  00000-0  10000-3 0  4793",
+			"tle2": "2 04321 102.0742 180.8177 0027794  77.3725 283.0451 12.52162775889545",
 			"visible": false
 		},
 		"OSCAR 6 (AO-6)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 06236U 72082B   10320.58604807 -.00000027  00000-0  10000-3 0  3897",
-			"tle2": "2 06236 101.3983 318.0149 0004024 321.3682  38.7094 12.53083346742217",
+			"tle1": "1 06236U 72082B   11146.95699037 -.00000027  00000-0  10000-3 0  4716",
+			"tle2": "2 06236 101.4085 141.7769 0003926 308.3500  51.7222 12.53085823766186",
 			"visible": false
 		},
 		"OSCAR 7 (AO-7)": 
@@ -2637,69 +3189,75 @@
 			}],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 07530U 74089B   10322.06901485 -.00000027  00000-0  10000-3 0  9303",
-			"tle2": "2 07530 101.3980 331.9422 0011910 333.6602  26.3864 12.53580201647731",
+			"tle1": "1 07530U 74089B   11147.64594113 -.00000027  00000-0  10000-3 0   883",
+			"tle2": "2 07530 101.3914 154.9979 0011841 321.2490  38.7728 12.53582494671615",
 			"visible": false
 		},
 		"OSCAR 8 (AO-8)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 10703U 78026B   10322.12425983 -.00000250  00000-0 -14418-3 0  9963",
-			"tle2": "2 10703  98.7610 351.3336 0006133 165.9784 194.1550 13.98875339668574",
+			"tle1": "1 10703U 78026B   11147.52386129 -.00000024  00000-0  12258-4 0  1715",
+			"tle2": "2 10703  98.7434 173.1374 0007399   6.0411 354.0830 13.98898319695196",
 			"visible": false
 		},
 		"PACSAT (AO-16)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 20439U 90005D   10321.43326021  .00000068  00000-0  41141-4 0   451",
-			"tle2": "2 20439  98.3548 273.4704 0011919  72.8291 287.4197 14.31883613 87319",
+			"tle1": "1 20439U 90005D   11147.89761960  .00000064  00000-0  39647-4 0  1964",
+			"tle2": "2 20439  98.3830  98.1954 0010122 221.3410 138.7004 14.31920669114714",
 			"visible": false
 		},
 		"PAN SAT (PO-34)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25520U 98064B   10322.21808558  .00001106  00000-0  43739-4 0  6227",
-			"tle2": "2 25520  28.4594  18.3426 0005569 203.2309 156.8051 15.17743861667576",
+			"tle1": "1 25520U 98064B   11147.49781784  .00000788  00000-0  28095-4 0  7554",
+			"tle2": "2 25520  28.4602 183.0871 0005384 122.3909 237.7208 15.18107599696514",
 			"visible": false
 		},
 		"PCSAT (NO-44)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 26931U 01043C   10321.69637574 -.00000251  00000-0 -65496-4 0  6095",
-			"tle2": "2 26931  67.0506 168.4596 0005783 274.0379  86.0050 14.29619758476694",
+			"tle1": "1 26931U 01043C   11147.33370987  .00000263  00000-0  13483-3 0  7613",
+			"tle2": "2 26931  67.0532  37.2613 0006911 261.6381  98.3951 14.29661156503949",
 			"visible": false
 		},
 		"PEHUENSAT 1 (PO-63)": 
 		{
+			"comms": [],
 			"groups": [],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 29712U 07001D   10322.06049954  .00001864  00000-0  24430-3 0  3870",
-			"tle2": "2 29712  97.7652   9.2962 0014576  28.6070 331.5936 14.81421537208267",
+			"tle1": "1 29712U 07001D   11148.17434184  .00001670  00000-0  21584-3 0  5540",
+			"tle2": "2 29712  97.7386 194.3164 0015024 117.7290 242.5446 14.82132161236568",
 			"visible": false
 		},
 		"PHASE 3B (AO-10)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-17T03:55:17,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 14129U 83058B   10320.42733179 -.00000164  00000-0  10000-3 0  7829",
-			"tle2": "2 14129  26.8485  64.8352 6037527  14.7778 356.9523  2.05866968178306",
+			"tle1": "1 14129U 83058B   11144.85415099  .00000070  00000-0  10000-3 0  8634",
+			"tle2": "2 14129  27.1079  34.8306 6024505  65.1965 344.5407  2.05867287182208",
 			"visible": false
 		},
 		"PHASE 3D (AO-40)": 
@@ -2711,30 +3269,32 @@
 			}],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 26609U 00072B   10320.91987577 -.00000045  00000-0  10000-3 0  4417",
-			"tle2": "2 26609   8.5609 304.2842 7952251   8.8229 359.4061  1.25587159 46131",
+			"tle1": "1 26609U 00072B   11145.42184086 -.00000102  00000-0  10000-3 0  5272",
+			"tle2": "2 26609   7.4717 267.9645 7925653  76.0917 352.9452  1.25586290 48513",
 			"visible": false
 		},
 		"POSAT (PO-28)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 22829U 93061G   10321.05629045  .00000024  00000-0  25577-4 0  6274",
-			"tle2": "2 22829  98.4888 266.7045 0010361 138.7501 221.4472 14.30266612894325",
+			"tle1": "1 22829U 93061G   11147.66681858  .00000093  00000-0  52358-4 0  7801",
+			"tle2": "2 22829  98.5134  93.9906 0009035 301.2962  58.7330 14.30299437921719",
 			"visible": false
 		},
 		"PRISM": 
 		{
+			"comms": [],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 33493U 09002B   10322.15314477  .00000984  00000-0  13318-3 0   477",
-			"tle2": "2 33493  98.1020  83.1316 0020050   6.9482 353.1996 14.81203122 98278",
+			"tle1": "1 33493U 09002B   11148.17114711  .00000845  00000-0  11400-3 0  6196",
+			"tle2": "2 33493  98.1221 276.4940 0021135 105.4226 254.9318 14.81680025126557",
 			"visible": false
 		},
 		"RADIO ROSTO (RS-15)": 
@@ -2760,60 +3320,65 @@
 			}],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 23439U 94085A   10320.93760241 -.00000039  00000-0  10000-3 0  3514",
-			"tle2": "2 23439  64.8143 147.5159 0163547 317.4176  41.4162 11.27554779654490",
+			"tle1": "1 23439U 94085A   11146.62405596 -.00000039  00000-0  10000-3 0  4056",
+			"tle2": "2 23439  64.8173 199.1118 0167262 284.5994  73.6434 11.27555878675999",
 			"visible": false
 		},
 		"RESURS-DK 1": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 29228U 06021A   10322.11254962  .00000263  00000-0  29516-4 0  9774",
-			"tle2": "2 29228  69.9355  76.2357 0002257  33.4408 326.6896 14.98866657247621",
+			"tle1": "1 29228U 06021A   11148.16961806  .00000406  00000-0  41217-4 0  5506",
+			"tle2": "2 29228  69.9360 312.6208 0003821 166.7166 176.1727 14.98969982276244",
 			"visible": true
 		},
 		"RUBIN-2 & SAFIR-M": 
 		{
+			"comms": [],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27605U 02058A   10321.21457165  .00000232  00000-0  57323-4 0  3314",
-			"tle2": "2 27605  64.5576 236.4239 0046581  15.9401 344.3156 14.72512764425217",
+			"tle1": "1 27605U 02058A   11147.18617313  .00000040  00000-0  27720-4 0  4844",
+			"tle2": "2 27605  64.5579  15.4076 0069648 326.1960  33.4710 14.72603855453338",
 			"visible": false
 		},
 		"SAPPHIRE (NO-45)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 26932U 01043D   10322.06409427  .00000098  00000-0  70451-4 0  6153",
-			"tle2": "2 26932  67.0554 167.6382 0004601 291.0654  68.9956 14.29654714476791",
+			"tle1": "1 26932U 01043D   11148.18740434  .00000203  00000-0  11128-3 0  7670",
+			"tle2": "2 26932  67.0571  35.2615 0008739 261.2146  98.7966 14.29682517504112",
 			"visible": false
 		},
 		"SAUDISAT 1A (SO-41)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 26545U 00057A   10321.12237538  .00000157  00000-0  38997-4 0  6802",
-			"tle2": "2 26545  64.5591 321.4457 0025623 194.4212 165.6158 14.80763872547881",
+			"tle1": "1 26545U 00057A   11148.18814967  .00000139  00000-0  36191-4 0  8461",
+			"tle2": "2 26545  64.5539  89.4423 0005153  76.9265 283.2416 14.80909864576323",
 			"visible": false
 		},
 		"SAUDISAT 1B (SO-42)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 26549U 00057E   10322.09446823  .00000120  00000-0  34976-4 0  7727",
-			"tle2": "2 26549  64.5590 337.9696 0030764 191.8215 168.2173 14.79613893547631",
+			"tle1": "1 26549U 00057E   11148.22853365  .00000113  00000-0  33665-4 0  9371",
+			"tle2": "2 26549  64.5541 109.9059 0009263 101.9889 258.2254 14.79751555575916",
 			"visible": false
 		},
 		"SAUDISAT 1C (SO-50)": 
@@ -2831,267 +3396,293 @@
 			}],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 27607U 02058C   10321.25400260  .00000286  00000-0  66884-4 0  3203",
-			"tle2": "2 27607  64.5582 251.5684 0047746  15.4594 344.7940 14.71606704424907",
+			"tle1": "1 27607U 02058C   11147.27279216  .00000254  00000-0  60909-4 0  4755",
+			"tle2": "2 27607  64.5589  31.2280 0070454 325.9094  33.7497 14.71745235453014",
 			"visible": false
 		},
 		"SEASAT 1": 
 		{
+			"comms": [],
 			"groups": [],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 10967U 78064A   10321.53605250  .00000024  00000-0  48780-4 0  2676",
-			"tle2": "2 10967 108.0192 324.4934 0002485 240.7819 119.3083 14.42239798699902",
+			"tle1": "1 10967U 78064A   11147.55100662 -.00000035  00000-0  30808-4 0  4231",
+			"tle2": "2 10967 108.0175   2.8299 0002516 235.3273 124.7634 14.42296065727446",
 			"visible": false
 		},
 		"SEDSAT 1 (SO-33)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25509U 98061B   10322.30362677  .00000118  00000-0  94215-5 0  8396",
-			"tle2": "2 25509  31.4346 356.9730 0353788 197.5230 161.2934 14.28339742630107",
+			"tle1": "1 25509U 98061B   11147.96728023  .00000201  00000-0  29932-4 0  9763",
+			"tle2": "2 25509  31.4327 358.6645 0352976  64.7746 298.9104 14.28403459657388",
 			"visible": false
 		},
 		"SERT 2": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 04327U 70009A   10320.70528417  .00000032  00000-0  10000-3 0  2455",
-			"tle2": "2 04327  99.1405 165.1750 0005401  73.3004 286.8728 13.58245154 21055",
+			"tle1": "1 04327U 70009A   11147.15499042  .00000032  00000-0  10000-3 0  3274",
+			"tle2": "2 04327  99.1326 343.3605 0004758 312.5786  47.4952 13.58255292 47046",
 			"visible": true
 		},
 		"SL-12 R/B(2)": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 15772U 85042D   10322.17978851  .00000075  00000-0  56537-4 0  3889",
-			"tle2": "2 15772  71.1088   4.1488 0036029 180.9133 179.1898 14.20739366320097",
+			"tle1": "1 15772U 85042D   11147.55980874  .00000097  00000-0  66441-4 0  5381",
+			"tle2": "2 15772  71.1034 322.7557 0037356 242.5004 117.2320 14.20761984347138",
 			"visible": true
 		},
 		"SL-14 R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 26874U 01032B   10321.75352087  .00002334  00000-0  65062-4 0  6078",
-			"tle2": "2 26874  82.4792 251.1799 0024948  88.2277 272.1819 15.35884321519832",
+			"tle1": "1 26874U 01032B   11147.14668258  .00001689  00000-0  45478-4 0  7698",
+			"tle2": "2 26874  82.4798  56.6576 0024095 124.1508 236.2015 15.36760719549061",
 			"visible": true
 		},
 		"SL-16 R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 31793U 07029B   10321.51709871  .00000116  00000-0  86224-4 0  9901",
-			"tle2": "2 31793  70.9797  36.6891 0001879 264.9427  95.1461 14.14071429174883",
+			"tle1": "1 31793U 07029B   11147.15844364 -.00000167  00000-0 -62849-4 0  1395",
+			"tle2": "2 31793  70.9732 356.5085 0002172 268.5917  91.4956 14.14078855201836",
 			"visible": true
 		},
 		"SL-3 R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 19046U 88032B   10321.68616558  .00000970  00000-0  90318-4 0  6801",
-			"tle2": "2 19046  97.8375   6.5356 0037994 154.7540 205.5593 14.96145310212530",
+			"tle1": "1 19046U 88032B   11147.41725347  .00000317  00000-0  33058-4 0  8575",
+			"tle2": "2 19046  97.8066 197.1506 0036475 240.1394 119.6202 14.96347137241053",
 			"visible": true
 		},
 		"SL-6 R/B(2)": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 20666U 90055D   10322.13246213  .00000420  00000-0  58259-4 0   630",
-			"tle2": "2 20666  62.7854 220.6554 0144428  91.4537 270.3093 14.86664481103264",
+			"tle1": "1 20666U 90055D   11147.87728452  .00000463  00000-0  62678-4 0  2298",
+			"tle2": "2 20666  62.7836 308.6704 0138759 110.5983 251.0059 14.86917912131625",
 			"visible": true
 		},
 		"SL-8 R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 29659U 06060B   10321.48108845  .00004894  00000-0  16482-3 0  1517",
-			"tle2": "2 29659  98.1279 111.4438 0035540 232.9673 126.8309 15.30721122218251",
+			"tle1": "1 29659U 06060B   11147.52632704  .00003012  00000-0  96957-4 0  3097",
+			"tle2": "2 29659  98.1467 321.1046 0033469 286.0144  73.7402 15.32644720247498",
 			"visible": true
 		},
 		"SSETI EXPRESS (XO-53)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28894U 05043E   10321.55982579  .00000114  00000-0  33108-4 0  9186",
-			"tle2": "2 28894  97.9865 200.0444 0017591 163.2509 196.9271 14.59767702269471",
+			"tle1": "1 28894U 05043E   11147.24836402  .00000109  00000-0  32038-4 0   807",
+			"tle2": "2 28894  97.9647  23.5070 0016777 291.5875  68.3538 14.59833107297290",
 			"visible": false
 		},
 		"STARS": 
 		{
+			"comms": [],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 33498U 09002G   10321.24120587  .00000590  00000-0  10279-3 0  2588",
-			"tle2": "2 33498  98.0707  70.4658 0013928 112.0570 248.2110 14.71595019 97498",
+			"tle1": "1 33498U 09002G   11147.36148543  .00000462  00000-0  81924-4 0  4216",
+			"tle2": "2 33498  98.0797 260.1329 0011977 221.7826 138.2494 14.71828716125605",
 			"visible": false
 		},
 		"SUMBANDILA (SO-67)": 
 		{
+			"comms": [],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 35870U 09049F   10322.11216189  .00001455  00000-0  68301-4 0  2970",
-			"tle2": "2 35870  97.3126   7.0170 0001536 298.7776  94.8897 15.21187397 64851",
+			"tle1": "1 35870U 09049F   11148.14794692  .00001102  00000-0  53141-4 0  8779",
+			"tle2": "2 35870  97.2820 192.1735 0003897  89.9296 355.6698 15.20720460 93899",
 			"visible": false
 		},
 		"SUNSAT (SO-35)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25636U 99008C   10321.83550082  .00000050  00000-0  20939-4 0  7604",
-			"tle2": "2 25636  96.4775  27.1655 0148894  20.4341 340.2724 14.43525197617924",
+			"tle1": "1 25636U 99008C   11148.07933028  .00000060  00000-0  23073-4 0  9181",
+			"tle2": "2 25636  96.4512 172.6027 0148600 133.7811 227.5792 14.43563652645513",
 			"visible": false
 		},
 		"SUZAKU (ASTRO-EII)": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28773U 05025A   10322.07836626  .00001124  00000-0  79792-4 0  3793",
-			"tle2": "2 28773  31.4043 221.3987 0006846 264.7091  95.2772 15.01263882294237",
+			"tle1": "1 28773U 05025A   11148.21470087  .00000692  00000-0  46389-4 0  5103",
+			"tle2": "2 28773  31.4049  89.4862 0006889 342.1954  17.8447 15.01710862322982",
 			"visible": true
 		},
 		"TECHSAT 1B (GO-32)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25397U 98043D   10321.64738531 -.00000164  00000-0 -54477-4 0  3341",
-			"tle2": "2 25397  98.3173 320.6757 0001565 137.7198 222.4084 14.23188720641876",
+			"tle1": "1 25397U 98043D   11148.01612843  .00000076  00000-0  51670-4 0  4890",
+			"tle2": "2 25397  98.3239 141.6576 0001410  20.1892 339.9362 14.23209118669096",
 			"visible": false
 		},
 		"THOR AGENA D R/B": 
 		{
+			"comms": [],
 			"groups": ["visual"],
 			"hintColor": [0.5, 0.5, 0.5],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 00733U 64002A   10321.18393065  .00000025  00000-0  27460-4 0  2169",
-			"tle2": "2 00733  99.0620  12.0431 0034383 332.3479  27.5871 14.31320612438305",
+			"tle1": "1 00733U 64002A   11147.79127244  .00000054  00000-0  38072-4 0  3699",
+			"tle2": "2 00733  99.0327 211.4666 0034536 133.1008 227.3072 14.31359408465712",
 			"visible": true
 		},
 		"TIROS N": 
 		{
+			"comms": [],
 			"groups": ["scientific", "weather", "non-operational"],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 11060U 78096A   10321.01826036  .00000025  00000-0  35004-4 0  6250",
-			"tle2": "2 11060  98.9952 301.0356 0010914 346.3637  13.7245 14.17526066872318",
+			"tle1": "1 11060U 78096A   11147.58324093  .00000021  00000-0  33019-4 0  7784",
+			"tle2": "2 11060  99.0161 135.1942 0010769 153.1180 207.0554 14.17560897899459",
 			"visible": false
 		},
 		"TIUNGSAT-1 (MO-46)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 26548U 00057D   10321.31953476  .00000385  00000-0  64278-4 0  8516",
-			"tle2": "2 26548  64.5542 276.8264 0018980 201.6405 158.3884 14.83589591548818",
+			"tle1": "1 26548U 00057D   11147.88234204  .00000123  00000-0  32414-4 0   199",
+			"tle2": "2 26548  64.5552  43.6704 0005450 347.1351  12.9614 14.83781918577233",
 			"visible": false
 		},
 		"TMSAT-1 (TO-31)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25396U 98043C   10321.76793573  .00000004  00000-0  19428-4 0  8477",
-			"tle2": "2 25396  98.3078 326.8047 0002982 133.4497 226.6923 14.23818527642096",
+			"tle1": "1 25396U 98043C   11148.05190541  .00000002  00000-0  18689-4 0  9986",
+			"tle2": "2 25396  98.3109 147.6123 0002439 337.1508  22.9561 14.23843280669311",
 			"visible": false
 		},
 		"UARS": 
 		{
+			"comms": [],
 			"groups": [],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 21701U 91063B   10322.24113040  .00028327  00000-0  24530-3 0  1310",
-			"tle2": "2 21701  56.9677 233.6001 0061877 111.9326 248.8331 15.66498549 60192",
+			"tle1": "1 21701U 91063B   11147.87536389  .00049484  11000-4  24729-3 0  3203",
+			"tle2": "2 21701  56.9601  96.0901 0039199 125.8485 234.6237 15.81385777 90175",
 			"visible": false
 		},
 		"UNAMSAT-2 (MO-30)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 24305U 96052B   10322.11302697  .00000029  00000-0  15235-4 0  5800",
-			"tle2": "2 24305  82.9348 330.2467 0028360 250.1948 109.6145 13.73590051711912",
+			"tle1": "1 24305U 96052B   11147.23247422  .00000045  00000-0  31245-4 0  7431",
+			"tle2": "2 24305  82.9371 189.6226 0031877  81.1712 279.3049 13.73601280738010",
 			"visible": false
 		},
 		"UOSAT 12 (UO-36)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 25693U 99021A   10321.49545683  .00000167  00000-0  41813-4 0  3569",
-			"tle2": "2 25693  64.5587 323.3876 0046070 290.3672  69.2511 14.78836182624486",
+			"tle1": "1 25693U 99021A   11147.46276706  .00000087  00000-0  31179-4 0  5220",
+			"tle2": "2 25693  64.5532  96.5579 0049809 265.2742  94.2674 14.78909549652721",
 			"visible": false
 		},
 		"UOSAT 2 (UO-11)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 14781U 84021B   10321.71416308  .00000320  00000-0  49548-4 0  3941",
-			"tle2": "2 14781  98.0371  13.7498 0010221 101.3121 258.9309 14.79859380434515",
+			"tle1": "1 14781U 84021B   11147.38281871  .00000124  00000-0  23358-4 0  5592",
+			"tle2": "2 14781  98.0066 204.1567 0008630 199.8417 160.2460 14.79970005462714",
 			"visible": false
 		},
 		"UOSAT 3 (UO-14)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 20437U 90005B   10322.29863776  .00000032  00000-0  27728-4 0  3625",
-			"tle2": "2 20437  98.4104 267.3688 0011641  72.5182 287.7280 14.31592527 87325",
+			"tle1": "1 20437U 90005B   11147.89350837  .00000017  00000-0  22507-4 0  5126",
+			"tle2": "2 20437  98.4365  92.3695 0009992 223.2580 136.7816 14.31622694114598",
 			"visible": false
 		},
 		"UOSAT 4 (UO-15)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 20438U 90005C   10321.79518041  .00000002  00000-0  17249-4 0  8610",
-			"tle2": "2 20438  98.4645 262.3652 0010903 105.7078 254.5328 14.30481531 86612",
+			"tle1": "1 20438U 90005C   11146.97862353  .00000016  00000-0  22694-4 0   161",
+			"tle2": "2 20438  98.4871  87.7532 0008990 266.5927  93.4228 14.30504723113801",
 			"visible": false
 		},
 		"UOSAT 5 (UO-22)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 21575U 91050B   10322.06101483  .00000032  00000-0  24195-4 0  9873",
-			"tle2": "2 21575  98.5144 270.6982 0006444 265.7862  94.2577 14.39745409 15366",
+			"tle1": "1 21575U 91050B   11147.89662579  .00000097  00000-0  45040-4 0  1413",
+			"tle2": "2 21575  98.5412 100.6929 0008255  57.9480 302.2494 14.39793254 42828",
 			"visible": false
 		},
 		"UWE-1": 
@@ -3103,30 +3694,32 @@
 				"modulation": "AFSK, 9600 baud"
 			}],
 			"groups": [],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 28892U 05043C   10321.14409103  .00000294  00000-0  70491-4 0  7820",
-			"tle2": "2 28892  97.9874 199.5372 0017475 162.4179 197.7629 14.59943851269417",
+			"tle1": "1 28892U 05043C   11147.69660790  .00000240  00000-0  59230-4 0  9391",
+			"tle2": "2 28892  97.9692  23.9328 0016363 287.3603  72.5800 14.60080260297364",
 			"visible": false
 		},
 		"WEBERSAT (WO-18)": 
 		{
+			"comms": [],
 			"groups": ["amateur", "non-operational"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 20441U 90005F   10321.48270678  .00000057  00000-0  36737-4 0  2719",
-			"tle2": "2 20441  98.3364 275.8747 0012567  70.3701 289.8843 14.31950846 87395",
+			"tle1": "1 20441U 90005F   11147.09965842  .00000055  00000-0  35985-4 0  4193",
+			"tle2": "2 20441  98.3637  99.4125 0010708 221.2904 138.7472 14.31987384114674",
 			"visible": false
 		},
 		"YUBILEINY (RS-30)": 
 		{
+			"comms": [],
 			"groups": ["amateur"],
 			"hintColor": [0.3, 0.2, 0],
-			"lastUpdated": 2010-11-18T21:00:01,
+			"lastUpdated": 2011-05-29T01:03:20,
 			"orbitVisible": false,
-			"tle1": "1 32953U 08025A   10321.94431816  .00000010  00000-0  00000+0 0  2230",
-			"tle2": "2 32953  82.4994 294.0655 0019784 123.9214 236.3751 12.43009179112841",
+			"tle1": "1 32953U 08025A   11148.02532117  .00000010  00000-0  00000+0 0  7687",
+			"tle2": "2 32953  82.5008 175.2571 0020444  72.4707 287.8609 12.43013098136580",
 			"visible": false
 		}
 	},

=== modified file 'plugins/Satellites/src/CMakeLists.txt'
--- plugins/Satellites/src/CMakeLists.txt	2010-11-18 21:44:57 +0000
+++ plugins/Satellites/src/CMakeLists.txt	2011-05-28 23:11:30 +0000
@@ -4,11 +4,6 @@
 
 SET(Satellites_SRCS
   gsatellite/gException.hpp
-  gsatellite/gMatrix.cpp
-  gsatellite/gMatrix.hpp
-  gsatellite/gMatrixTempl.hpp
-  gsatellite/gObserver.cpp
-  gsatellite/gObserver.hpp
   gsatellite/gSatTEME.cpp
   gsatellite/gSatTEME.hpp
   gsatellite/mathUtils.cpp
@@ -27,7 +22,8 @@
   gsatellite/sgp4unit.h
   gsatellite/stdsat.h
 
-  
+  gSatWrapper.hpp
+  gSatWrapper.cpp
   Satellite.hpp
   Satellite.cpp
   Satellites.hpp

=== modified file 'plugins/Satellites/src/Satellite.cpp'
--- plugins/Satellites/src/Satellite.cpp	2010-11-26 10:20:10 +0000
+++ plugins/Satellites/src/Satellite.cpp	2011-05-28 23:11:30 +0000
@@ -1,17 +1,17 @@
 /*
  * Stellarium
  * Copyright (C) 2009 Matthew Gates
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -28,12 +28,6 @@
 #include "VecMath.hpp"
 #include "StelUtils.hpp"
 
-
-#include "gsatellite/gSatTEME.hpp"
-#include "gsatellite/gObserver.hpp"
-#include "gsatellite/gTime.hpp"
-#include "gsatellite/gVector.hpp"
-
 #include <QTextStream>
 #include <QRegExp>
 #include <QDebug>
@@ -42,6 +36,8 @@
 #include <QSettings>
 #include <QByteArray>
 
+#include "gsatellite/gTime.hpp"
+
 #include <cmath>
 
 // static data members - will be initialised in the Satallites class (the StelObjectMgr)
@@ -57,12 +53,12 @@
 
 
 Satellite::Satellite(const QVariantMap& map)
-	: initialized(false), visible(true), hintColor(0.0,0.0,0.0), lastUpdated(), pSatellite(NULL)
+		: initialized(false), visible(true), hintColor(0.0,0.0,0.0), lastUpdated(), pSatWrapper(NULL)
 {
 	// return initialized if the mandatory fields are not present
 	if (!map.contains("designation") || !map.contains("tle1") || !map.contains("tle2"))
 		return;
-	
+
 	font.setPixelSize(16);
 
 	designation  = map.value("designation").toString();
@@ -108,7 +104,7 @@
 
 	if (map.contains("comms"))
 	{
-		foreach(QVariant comm, map.value("comms").toList())
+                foreach(const QVariant &comm, map.value("comms").toList())
 		{
 			QVariantMap commMap = comm.toMap();
 			commLink c;
@@ -121,7 +117,7 @@
 
 	if (map.contains("groups"))
 	{
-		foreach(QVariant group, map.value("groups").toList())
+                foreach(const QVariant &group, map.value("groups").toList())
 		{
 			if (!groupIDs.contains(group.toString()))
 				groupIDs << group.toString();
@@ -134,15 +130,13 @@
 	{
 		lastUpdated = map.value("lastUpdated").toDateTime();
 	}
-
-	setObserverLocation();
 	initialized = true;
 }
 
 Satellite::~Satellite()
 {
-	if(pSatellite != NULL)
-		delete pSatellite;
+	if (pSatWrapper != NULL)
+		delete pSatWrapper;
 }
 
 double Satellite::roundToDp(float n, int dp)
@@ -169,7 +163,7 @@
 	map["hintColor"] = col;
 	map["orbitColor"] = orbitCol;
 	QVariantList commList;
-	foreach(commLink c, comms)
+        foreach(const commLink &c, comms)
 	{
 		QVariantMap commMap;
 		commMap["frequency"] = c.frequency;
@@ -178,8 +172,8 @@
 		commList << commMap;
 	}
 	map["comms"] = commList;
-		QVariantList groupList;
-	foreach(QString g, groupIDs)
+	QVariantList groupList;
+        foreach(const QString &g, groupIDs)
 	{
 		groupList << g;
 	}
@@ -203,7 +197,7 @@
 	QString str;
 	QTextStream oss(&str);
 
-	if (flags&Name) 
+	if (flags&Name)
 	{
 		oss << "<h2>" << designation << "</h2><br>";
 		if (description!="")
@@ -219,24 +213,43 @@
 		oss << QString("Range (km): <b>%1</b>").arg(range, 5, 'f', 2) << "<br>";
 		oss << QString("Range rate (km/s): <b>%1</b>").arg(rangeRate, 5, 'f', 3) << "<br>";
 		oss << QString("Altitude (km): <b>%1</b>").arg(height, 5, 'f', 2) << "<br>";
-		oss << QString("SubPoint Lat/Long(Deg): <b>%1</b>").arg(LatLong[0], 5, 'f', 2) << "/";
-		oss << QString("<b>%1</b>").arg(LatLong[1], 5, 'f', 3);
+                oss << QString("SubPoint Lat/Long(Deg): <b>%1</b>").arg(latLongSubPointPosition[0], 5, 'f', 2) << "/";
+                oss << QString("<b>%1</b>").arg(latLongSubPointPosition[1], 5, 'f', 3);
 		oss << "</p>";
 
 		oss << "TEME Coordinates(km):  ";
-		oss << QString("<b>X:</b> %1 ").arg(Position[0], 5, 'f', 2);
-		oss << QString("<b>Y:</b> %1 ").arg(Position[1], 5, 'f', 2);
-		oss << QString("<b>Z:</b> %1 ").arg(Position[2], 5, 'f', 2) << "<br>";
+                oss << QString("<b>X:</b> %1 ").arg(position[0], 5, 'f', 2);
+                oss << QString("<b>Y:</b> %1 ").arg(position[1], 5, 'f', 2);
+                oss << QString("<b>Z:</b> %1 ").arg(position[2], 5, 'f', 2) << "<br>";
 		oss << "TEME Vel(km/s):  ";
-		oss << QString("<b>X:</b> %1 ").arg(Vel[0], 5, 'f', 2);
-		oss << QString("<b>Y:</b> %1 ").arg(Vel[1], 5, 'f', 2);
-		oss << QString("<b>Z:</b> %1 ").arg(Vel[2], 5, 'f', 2) << "<br>";
-
+                oss << QString("<b>X:</b> %1 ").arg(velocity[0], 5, 'f', 2);
+                oss << QString("<b>Y:</b> %1 ").arg(velocity[1], 5, 'f', 2);
+                oss << QString("<b>Z:</b> %1 ").arg(velocity[2], 5, 'f', 2) << "<br>";
+
+		oss << "Visibility:  ";
+                switch (visibility)
+		{
+		case RADAR_SUN:
+			oss << "Sat&Observer in Sunlit" << "<br>";
+			break;
+		case VISIBLE:
+			oss << "Visible" << "<br>";
+			break;
+		case RADAR_NIGHT:
+			oss << "Sat. Eclipsed" << "<br>";
+			break;
+		case NOT_VISIBLE:
+			oss << "Sat. Not Visible" << "<br>";
+			break;
+		default:
+			break;
+
+		}
 	}
 
 	if (flags&Extra2 && comms.size() > 0)
 	{
-		foreach (commLink c, comms)
+                foreach(const commLink &c, comms)
 		{
 			double dop = getDoppler(c.frequency);
 			double ddop = dop;
@@ -254,33 +267,17 @@
 			if (!c.description.isEmpty() && c.description != "") oss << "  " << c.description;
 			if ((!c.modulation.isEmpty() && c.modulation != "") || (!c.description.isEmpty() && c.description != "")) oss << "<br>";
 			oss << QString("%1 MHz (%2%3 kHz)</p>").arg(c.frequency, 8, 'f', 5)
-			                                       .arg(sign)
-			                                       .arg(ddop, 6, 'f', 3);
-		}		
+			.arg(sign)
+			.arg(ddop, 6, 'f', 3);
+		}
 	}
 
 	postProcessInfoString(str, flags);
 	return str;
 }
 
-void Satellite::setObserverLocation(StelLocation* loc)
+Vec3f Satellite::getInfoColor(void) const
 {
-	StelLocation l;
-	if (loc==NULL)
-	{
-		l = StelApp::getInstance().getCore()->getNavigator()->getCurrentLocation();
-	}
-	else
-	{
-		l = *loc;
-	}
-
-
-	observer.setPosition( l.latitude, l.longitude, l.altitude / 1000.0);
-
-}
-
-Vec3f Satellite::getInfoColor(void) const {
 	return StelApp::getInstance().getVisionModeNight() ? Vec3f(0.6, 0.0, 0.0) : hintColor;
 }
 
@@ -296,10 +293,10 @@
 
 void Satellite::setNewTleElements(const QString& tle1, const QString& tle2)
 {
-	if (pSatellite)
+	if (pSatWrapper)
 	{
-		gSatTEME *old = pSatellite;
-		pSatellite = NULL;
+		gSatWrapper *old = pSatWrapper;
+		pSatWrapper = NULL;
 		delete old;
 	}
 
@@ -308,44 +305,29 @@
 	tleElements.second.clear();
 	tleElements.second.append(tle2);
 
-	// The TLE library actually modifies the TLE strings, which is annoying (because
-	// when we get updates, we want to check if there has been a change by using ==
-	// with the original.  Thus we make a copy to send to the TLE library.
-	QByteArray t1(tleElements.first), t2(tleElements.second);
-
-	// Also, the TLE library expects no more than 130 characters length input.  We
-	// shouldn't have sane input with a TLE longer than about 80, but just in case
-	// we have a mal-formed input, we will truncate here to be safe
-	t1.truncate(130);
-	t2.truncate(130);
-
-	pSatellite = new gSatTEME(designation.toAscii().data(),
-				  t1.data(),
-				  t2.data());
+	pSatWrapper = new gSatWrapper(designation, tle1, tle2);
+	orbitPoints.clear();
 }
 
 void Satellite::update(double)
 {
-	double jul_utc = StelApp::getInstance().getCore()->getNavigator()->getJDay();
-
-	epochTime = jul_utc;
-
-	if (pSatellite)
+	if (pSatWrapper)
 	{
-		pSatellite->setEpoch( epochTime);
-		Position = pSatellite->getPos();
-		Vel      = pSatellite->getVel();
-		LatLong  = pSatellite->getSubPoint( epochTime);
-		azElPos  = observer.calculateLook( *pSatellite, epochTime);
-
-		azimuth   = azElPos[ AZIMUTH]/KDEG2RAD;
-		elevation = azElPos[ ELEVATION]/KDEG2RAD;
-		range     = azElPos[ RANGE];
-		rangeRate = azElPos[ RANGERATE];
-		height    = LatLong[2];
+		epochTime = StelApp::getInstance().getCore()->getNavigator()->getJDay();
+
+		pSatWrapper->setEpoch(epochTime);
+                position                 = pSatWrapper->getTEMEPos();
+                velocity                 = pSatWrapper->getTEMEVel();
+                latLongSubPointPosition  = pSatWrapper->getSubPoint();
+                height                   = latLongSubPointPosition[2];
+                elAzPosition             = pSatWrapper->getAltAz();
+                elAzPosition.normalize();
+
+		pSatWrapper->getSlantRange(range, rangeRate);
+                visibility = pSatWrapper->getVisibilityPredict();
 
 		// Compute orbit points to draw orbit line.
-		if(orbitVisible) computeOrbitPoints();
+		if (orbitVisible) computeOrbitPoints();
 	}
 }
 
@@ -353,7 +335,7 @@
 {
 	double result;
 	double f = freq * 1000000;
-	result = -f*((rangeRate*1000.0)/SPEED_OF_LIGHT);
+        result   = -f*((rangeRate*1000.0)/SPEED_OF_LIGHT);
 	return result/1000000;
 }
 
@@ -364,17 +346,14 @@
 
 void Satellite::draw(const StelCore* core, StelPainter& painter, float)
 {
-	float a = (azimuth-90)*M_PI/180;
-	Vec3d pos(sin(a),cos(a), tan(elevation * M_PI / 180.));
-        XYZ = core->getNavigator()->altAzToJ2000(pos);
+        XYZ = core->getNavigator()->altAzToJ2000(elAzPosition);
 	StelApp::getInstance().getVisionModeNight() ? glColor4f(0.6,0.0,0.0,1.0) : glColor4f(hintColor[0],hintColor[1],hintColor[2], Satellite::hintBrightness);
 
-
 	StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
+
 	Vec3d xy;
 	if (prj->project(XYZ,xy))
 	{
-
 		if (Satellite::showLabels)
 		{
 			painter.drawText(xy[0], xy[1], designation, 0, 10, 10, false);
@@ -382,54 +361,45 @@
 		}
 		painter.drawSprite2dMode(xy[0], xy[1], 11);
 
-		if(orbitVisible && Satellite::orbitLinesFlag) drawOrbit(painter);
+		if (orbitVisible && Satellite::orbitLinesFlag) drawOrbit(painter);
 	}
 }
 
 
-void Satellite::drawOrbit(StelPainter& painter){
-
-	Vec3d pos,posPrev;
-
-	float a, azimth, elev;
+void Satellite::drawOrbit(StelPainter& painter)
+{
+        Vec3d position,previousPosition;
 
 	glDisable(GL_TEXTURE_2D);
 
-	QList<gVector>::iterator it= orbitPoints.begin();
+	QList<Vec3d>::iterator it= orbitPoints.begin();
 
 	//First point projection calculation
-	azimth = it->at( AZIMUTH);
-	elev   = it->at( ELEVATION);
-	a      = ( (azimth/KDEG2RAD)-90)*M_PI/180;
-	posPrev.set(sin(a),cos(a), tan( (elev/KDEG2RAD) * M_PI / 180.));
+        previousPosition.set(it->operator [](0), it->operator [](1), it->operator [](2));
 
 	it++;
 	StelVertexArray vertexArray;
 	vertexArray.primitiveType=StelVertexArray::Lines;
 
 	//Rest of points
-	for(int i=1; i<orbitPoints.size();i++)
+	for (int i=1; i<orbitPoints.size(); i++)
 	{
-		azimth = it->at( AZIMUTH);
-		elev   = it->at( ELEVATION);
-		a      = ( (azimth/KDEG2RAD)-90)*M_PI/180;
-		pos.set(sin(a),cos(a), tan( (elev/KDEG2RAD) * M_PI / 180.));
+                position.set(it->operator [](0), it->operator [](1), it->operator [](2));
 		it++;
-
-		pos.normalize();
-		posPrev.normalize();
+                position.normalize();
+                previousPosition.normalize();
 
 		// Draw end (fading) parts of orbit lines one segment at a time.
 		if (i<=orbitLineFadeSegments || orbitLineSegments-i < orbitLineFadeSegments)
 		{
 			painter.setColor((*orbitColor)[0], (*orbitColor)[1], (*orbitColor)[2], hintBrightness * calculateOrbitSegmentIntensity(i));
-			painter.drawGreatCircleArc(posPrev, pos, &viewportHalfspace);
-		}
-		else {
-			vertexArray.vertex << posPrev << pos;
-		}
-
-		posPrev = pos;
+                        painter.drawGreatCircleArc(previousPosition, position, &viewportHalfspace);
+		}
+		else
+		{
+                        vertexArray.vertex << previousPosition << position;
+		}
+                previousPosition = position;
 	}
 
 	// Draw center section of orbit in one go
@@ -444,8 +414,14 @@
 float Satellite::calculateOrbitSegmentIntensity(int segNum)
 {
 	int endDist = (orbitLineSegments/2) - abs(segNum-1 - (orbitLineSegments/2) % orbitLineSegments);
-	if (endDist > orbitLineFadeSegments) { return 1.0; }
-	else { return (endDist  + 1) / (orbitLineFadeSegments + 1.0); }
+	if (endDist > orbitLineFadeSegments)
+	{
+		return 1.0;
+	}
+	else
+	{
+		return (endDist  + 1) / (orbitLineFadeSegments + 1.0);
+	}
 }
 
 void Satellite::setNightColors(bool night)
@@ -459,78 +435,80 @@
 
 void Satellite::computeOrbitPoints()
 {
-
 	gTimeSpan computeInterval(0, 0, 0, orbitLineSegmentDuration);
 	gTimeSpan orbitSpan(0, 0, 0, orbitLineSegments*orbitLineSegmentDuration/2);
 	gTime	  epochTm;
-	gVector   azElVector;
-	int	  diffSlots;
-
-	if( orbitPoints.isEmpty())//Setup orbitPoins
+        gTime	  epoch(epochTime);
+	gTime	  lastEpochComp(lastEpochCompForOrbit);
+        Vec3d     elAzVector;
+        int	  diffSlots;
+
+
+	if (orbitPoints.isEmpty())//Setup orbitPoins
 	{
-		epochTm  = epochTime - orbitSpan;
+                epochTm  = epoch - orbitSpan;
 
-		for(int i=0; i<=orbitLineSegments; i++)
+		for (int i=0; i<=orbitLineSegments; i++)
 		{
-			pSatellite->setEpoch( epochTm);
-			azElVector  = observer.calculateLook( *pSatellite, epochTm);
-			orbitPoints.append(azElVector);
-			epochTm += computeInterval;
+			pSatWrapper->setEpoch(epochTm.getGmtTm());
+                        elAzVector  = pSatWrapper->getAltAz();
+                        orbitPoints.append(elAzVector);
+			epochTm    += computeInterval;
 		}
 		lastEpochCompForOrbit = epochTime;
 	}
-	else if( epochTime > lastEpochCompForOrbit)
+	else if (epochTime > lastEpochCompForOrbit)
 	{ // compute next orbit point when clock runs forward
 
-		gTimeSpan diffTime = epochTime - lastEpochCompForOrbit;
+                gTimeSpan diffTime = epoch - lastEpochComp;
 		diffSlots          = (int)(diffTime.getDblSeconds()/orbitLineSegmentDuration);
 
-		if(diffSlots > 0)
+		if (diffSlots > 0)
 		{
-			if( diffSlots > orbitLineSegments)
+			if (diffSlots > orbitLineSegments)
 			{
 				diffSlots = orbitLineSegments + 1;
-				epochTm   = epochTime - orbitSpan;
+                                epochTm  = epoch - orbitSpan;
 			}
 			else
 			{
-				epochTm   = lastEpochCompForOrbit + orbitSpan + computeInterval;
+				epochTm   = lastEpochComp + orbitSpan + computeInterval;
 			}
 
-			for( int i=0; i<diffSlots; i++)
+			for (int i=0; i<diffSlots; i++)
 			{  //remove points at beginning of list and add points at end.
 				orbitPoints.removeFirst();
-				pSatellite->setEpoch( epochTm);
-				azElVector  = observer.calculateLook( *pSatellite, epochTm);
-				orbitPoints.append(azElVector);
-				epochTm += computeInterval;
+				pSatWrapper->setEpoch(epochTm.getGmtTm());
+                                elAzVector  = pSatWrapper->getAltAz();
+                                orbitPoints.append(elAzVector);
+				epochTm    += computeInterval;
 			}
 
 			lastEpochCompForOrbit = epochTime;
 		}
 	}
-	else if(epochTime < lastEpochCompForOrbit)
+	else if (epochTime < lastEpochCompForOrbit)
 	{ // compute next orbit point when clock runs backward
-		gTimeSpan diffTime =  lastEpochCompForOrbit - epochTime;
+                gTimeSpan diffTime = lastEpochComp - epoch;
 		diffSlots          = (int)(diffTime.getDblSeconds()/orbitLineSegmentDuration);
 
-		if(diffSlots > 0)
+		if (diffSlots > 0)
 		{
-			if( diffSlots > orbitLineSegments)
+			if (diffSlots > orbitLineSegments)
 			{
 				diffSlots = orbitLineSegments + 1;
-				epochTm   = epochTime + orbitSpan;
+                                epochTm   = epoch + orbitSpan;
 			}
 			else
 			{
-				epochTm   = epochTime - orbitSpan - computeInterval;
+                                epochTm   = epoch - orbitSpan - computeInterval;
 			}
-			for( int i=0; i<diffSlots;i++)
+			for (int i=0; i<diffSlots; i++)
 			{ //remove points at end of list and add points at beginning.
 				orbitPoints.removeLast();
-				pSatellite->setEpoch( epochTm);
-				azElVector  = observer.calculateLook( *pSatellite, epochTm);
-				orbitPoints.push_front(azElVector);
+				pSatWrapper->setEpoch(epochTm.getGmtTm());
+                                elAzVector  = pSatWrapper->getAltAz();
+                                orbitPoints.push_front(elAzVector);
 				epochTm -= computeInterval;
 
 			}

=== modified file 'plugins/Satellites/src/Satellite.hpp'
--- plugins/Satellites/src/Satellite.hpp	2010-11-18 18:11:12 +0000