diff --git a/Changes.md b/Changes.md
index a0d332a..373a845 100644
--- a/Changes.md
+++ b/Changes.md
@@ -3,6 +3,8 @@
 		- some fixes to wsnic.whois
 		- some fixes to gtld.whois and generic3.whois
 		- added handler for Godady and Domain Bank
+		- minor improvment to main.whois and generic2.whois
+		- added handler for .org
 
 2003/09/06  David Saez <david@ols.es>
 		- Added handlers for .cn and .ws
diff --git a/gtld.whois b/gtld.whois
index cd9a211..99fc480 100644
--- a/gtld.whois
+++ b/gtld.whois
@@ -55,30 +55,18 @@ class gtld extends Whois {
 		"ALABANZA, INC." => "bulkregistercom",
 		"BULKREGISTER.COM, INC."  => "bulkregistercom",
 		"CORE INTERNET COUNCIL OF REGISTRARS" => "core",
-		"R23-LROR" => "core",
 		"DOTSTER, INC." => "dotster",
-		"R34-LROR" => "dotster",
 		"ENOM, INC." => "enom",
-		"R39-LROR" => "enom",
 		"MELBOURNE IT, LTD. D/B/A INTERNET NAMES WORLDWIDE" => "inwwcom",
-		"R52-LROR" => "inwwcom",
 		"NETWORK SOLUTIONS, INC." => "netsol",
-		"R63-LROR" => "netsol",
 		"REGISTER.COM, INC." => "registercom",
 		"TUCOWS, INC." => "opensrsnet",
-		"R11-LROR"  => "opensrsnet",
 		"IHOLDINGS.COM, INC. D/B/A DOTREGISTRAR.COM" => "dotregistrar",
-		"R114-LROR" => "dotregistrar",
 		"INTERDOMAIN, S.A." => "interdomain",
-		"R49-LROR" => "interdomain",
 		"ASCIO TECHNOLOGIES, INC." => "ascio",
-		"R76-LROR" => "ascio",
 		"INTERCOSMOS MEDIA GROUP, INC. D/B/A DIRECTNIC.COM" => "directnic",
-		"R48-LROR" => "directnic",
 		"DOMAINDISCOVER" => "buydomains",
-		"R86-LROR" => "buydomains",
 		"TLDS, INC. DBA SRSPLUS" => "srsplus",
-		"R78-LROR" => "srsplus",
 		"DOMAIN BANK, INC." => "domainbank",
 		"GO DADDY SOFTWARE, INC." => "godaddy"
 		);
diff --git a/servers.whois b/servers.whois
index 13df5aa..83ee185 100644
--- a/servers.whois
+++ b/servers.whois
@@ -50,7 +50,7 @@ $this->DATA = array(
 	"net"	=> "gtld",
 	"nl"	=> "nlnic",
 	"nu"	=> "nunames",
-	"org"	=> "gtld",
+	"org"	=> "org",
 	"se"	=> "nicse",
 	"uk"	=> "uknic",
 	"ws"	=> "wsnic",
diff --git a/test.txt b/test.txt
index 890cfea..e747e30 100644
--- a/test.txt
+++ b/test.txt
@@ -19,26 +19,27 @@ wsnic		samoanic.ws
 
 // .com/.org/.net
 
-ascio.com	ascio.com ascio.org
+ascio.com	ascio.com
 bulkregistercom bulkregister.com
-buydomains	buydomains.com buydomains.org
-core            corenic.com corenic.org
-directnic	directnic.com directnic.org
+buydomains	buydomains.com
+core            corenic.com
+directnic	directnic.com
 domainbank	domainbank.com
-dotregistrar    dotregistrar.com dotregistrar.org
-dotster         dotster.com dotster.org
-enom            enom.com enom.org
+dotregistrar    dotregistrar.com
+dotster         dotster.com
+enom            enom.com
 godaddy		godaddy.com
-interdomain     interdominio.com interdomain.org
+interdomain     interdominio.com
 inwwcom         ?
-netsol          olsns.com olsns.org
-opensrsnet      tucows.com opensrs.org
+netsol          olsns.com
+opensrsnet      tucows.com
 registercom     register.com
-srsplus		srsplus.com, srsplus.org
+srsplus		srsplus.com
 
 // Other
 
 info            afilias.info
+org		ascio.org buydomains.org ...
 neulevel        forumed.biz
 
 // IP whois