diff --git a/data/aut-num/AS4242423452 b/data/aut-num/AS4242423452
index edb2856cc..cc0633f60 100644
--- a/data/aut-num/AS4242423452
+++ b/data/aut-num/AS4242423452
@@ -1,6 +1,6 @@
 aut-num:            AS4242423452
-as-name:            AS for TW Network
-admin-c:            TW-DN42
-tech-c:             TW-DN42
+as-name:            AS for gene396302 network
+admin-c:            GK-DN42
+tech-c:             GK-DN42
 mnt-by:             TW-MNT
 source:             DN42
diff --git a/data/inet6num/fd81:e49c:ba39::_48 b/data/inet6num/fd81:e49c:ba39::_48
new file mode 100644
index 000000000..352a367c0
--- /dev/null
+++ b/data/inet6num/fd81:e49c:ba39::_48
@@ -0,0 +1,13 @@
+inet6num:           fd81:e49c:ba39:0000:0000:0000:0000:0000 - fd81:e49c:ba39:ffff:ffff:ffff:ffff:ffff
+cidr:               fd81:e49c:ba39::/48
+netname:            TW-NETWORK
+descr:              Network of gene396302
+country:            TW
+admin-c:            GK-DN42
+tech-c:             GK-DN42
+mnt-by:             TW-MNT
+nserver:            ns1.twnet.dn42
+nserver:            ns2.twnet.dn42
+status:             ASSIGNED
+source:             DN42
+
diff --git a/data/inetnum/172.20.129.192_26 b/data/inetnum/172.20.129.192_26
index 6d1487f5d..c1b4263a0 100644
--- a/data/inetnum/172.20.129.192_26
+++ b/data/inetnum/172.20.129.192_26
@@ -1,8 +1,8 @@
 inetnum:            172.20.129.192 - 172.20.129.255
 cidr:               172.20.129.192/26
 netname:            TW-NETWORK
-admin-c:            TW-DN42
-tech-c:             TW-DN42
+admin-c:            GK-DN42
+tech-c:             GK-DN42
 mnt-by:             TW-MNT
 nserver:            ns1.twnet.dn42
 nserver:            ns2.twnet.dn42
diff --git a/data/mntner/TW-MNT b/data/mntner/TW-MNT
index a6e80e683..dd95888ab 100644
--- a/data/mntner/TW-MNT
+++ b/data/mntner/TW-MNT
@@ -1,5 +1,6 @@
 mntner:             TW-MNT
-admin-c:            TW-DN42
-tech-c:             TW-DN42
+admin-c:            GK-DN42
+tech-c:             GK-DN42
 mnt-by:             TW-MNT
 source:             DN42
+auth:               pgp-fingerprint 81EE336E02C05CD46427EE3B6C5892212631F5EE
diff --git a/data/organisation/ORG-TW b/data/organisation/ORG-TW
deleted file mode 100644
index 208e51ae4..000000000
--- a/data/organisation/ORG-TW
+++ /dev/null
@@ -1,7 +0,0 @@
-organisation:       ORG-TW
-org-name:           TW ORG
-descr:              BGP for fun
-admin-c:            TW-DN42
-tech-c:             TW-DN42
-mnt-by:             TW-MNT
-source:             DN42
diff --git a/data/route6/fd81:e49c:ba39::_48 b/data/route6/fd81:e49c:ba39::_48
new file mode 100644
index 000000000..69ee3eb1e
--- /dev/null
+++ b/data/route6/fd81:e49c:ba39::_48
@@ -0,0 +1,4 @@
+route6:             fd81:e49c:ba39::/48
+origin:             AS4242423452
+mnt-by:             TW-MNT
+source:             DN42