diff --git a/data/dns/factor2431.dn42 b/data/dns/factor2431.dn42
index c2d8ba517..3f46e037b 100644
--- a/data/dns/factor2431.dn42
+++ b/data/dns/factor2431.dn42
@@ -2,8 +2,6 @@ domain:             factor2431.dn42
 admin-c:            FACTOR2431-DN42
 tech-c:             FACTOR2431-DN42
 mnt-by:             FACTOR2431-MNT
-nserver:            dns.factor2431.dn42 172.22.105.7
-nserver:            dns.factor2431.dn42 fdf4:be86:71d9:5353::1
-nserver:            dns.factor2431.dn42 172.22.105.15
-nserver:            dns.factor2431.dn42 fdf4:be86:71d9:5354::1
+nserver:            ns.factor2431.dn42 172.23.173.184
+nserver:            ns.factor2431.dn42 fdf4:be86:71d9:5353::1
 source:             DN42
diff --git a/data/inet6num/fdf4:be86:71d9::_48 b/data/inet6num/fdf4:be86:71d9::_48
index 868b22f11..da84198e4 100644
--- a/data/inet6num/fdf4:be86:71d9::_48
+++ b/data/inet6num/fdf4:be86:71d9::_48
@@ -1,11 +1,8 @@
 inet6num:           fdf4:be86:71d9:0000:0000:0000:0000:0000 - fdf4:be86:71d9:ffff:ffff:ffff:ffff:ffff
 cidr:               fdf4:be86:71d9::/48
 netname:            FACTOR2431-NETWORK
-descr:              Network of Factor2431
-nserver:            5353.factor2431.dn42
-nserver:            5354.factor2431.dn42
-nserver:            5355.factor2431.dn42
-nserver:            5356.factor2431.dn42
+descr:              factor2431's backbone
+nserver:            ns.factor2431.dn42
 country:            CN
 admin-c:            FACTOR2431-DN42
 tech-c:             FACTOR2431-DN42
diff --git a/data/inetnum/172.22.105.0_28 b/data/inetnum/172.22.105.0_28
index 93bac01e2..3d113fb85 100644
--- a/data/inetnum/172.22.105.0_28
+++ b/data/inetnum/172.22.105.0_28
@@ -1,11 +1,8 @@
 inetnum:            172.22.105.0 - 172.22.105.15
 cidr:               172.22.105.0/28
 netname:            FACTOR2431-NETWORK
-descr:              Network of Factor2431
-nserver:            5353.factor2431.dn42
-nserver:            5354.factor2431.dn42
-nserver:            5355.factor2431.dn42
-nserver:            5356.factor2431.dn42
+descr:              factor2431's backbone
+nserver:            ns.factor2431.dn42
 country:            CN
 admin-c:            FACTOR2431-DN42
 tech-c:             FACTOR2431-DN42
diff --git a/data/inetnum/172.23.173.184_29 b/data/inetnum/172.23.173.184_29
new file mode 100644
index 000000000..a49595ce9
--- /dev/null
+++ b/data/inetnum/172.23.173.184_29
@@ -0,0 +1,11 @@
+inetnum:            172.23.173.184 - 172.23.173.191
+cidr:               172.23.173.184/29
+netname:            FACTOR2431-NETWORK
+descr:              factor2431's services
+nserver:            ns.factor2431.dn42
+country:            CN
+admin-c:            FACTOR2431-DN42
+tech-c:             FACTOR2431-DN42
+mnt-by:             FACTOR2431-MNT
+status:             ASSIGNED
+source:             DN42
diff --git a/data/route6/fdf4:be86:71d9:5353::_64 b/data/route/172.23.173.184_29
similarity index 57%
rename from data/route6/fdf4:be86:71d9:5353::_64
rename to data/route/172.23.173.184_29
index 8261b6bc1..d903dc398 100644
--- a/data/route6/fdf4:be86:71d9:5353::_64
+++ b/data/route/172.23.173.184_29
@@ -1,5 +1,5 @@
-route6:             fdf4:be86:71d9:5353::/64
-max-length:         64
+route:              172.23.173.184/29
+max-length:         29
 origin:             AS4242421534
 mnt-by:             FACTOR2431-MNT
 source:             DN42
diff --git a/data/route6/fdf4:be86:71d9:5354::_64 b/data/route6/fdf4:be86:71d9:5354::_64
deleted file mode 100644
index ffe593a56..000000000
--- a/data/route6/fdf4:be86:71d9:5354::_64
+++ /dev/null
@@ -1,5 +0,0 @@
-route6:             fdf4:be86:71d9:5354::/64
-max-length:         64
-origin:             AS4242421534
-mnt-by:             FACTOR2431-MNT
-source:             DN42
diff --git a/data/route6/fdf4:be86:71d9::_48 b/data/route6/fdf4:be86:71d9::_48
index 370ce85c5..8de33dbc4 100644
--- a/data/route6/fdf4:be86:71d9::_48
+++ b/data/route6/fdf4:be86:71d9::_48
@@ -1,5 +1,5 @@
 route6:             fdf4:be86:71d9::/48
-max-length:         49
+max-length:         64
 origin:             AS4242421534
 mnt-by:             FACTOR2431-MNT
 source:             DN42