diff --git a/data/aut-num/AS200201 b/data/aut-num/AS200201
new file mode 100644
index 000000000..09c767011
--- /dev/null
+++ b/data/aut-num/AS200201
@@ -0,0 +1,13 @@
+aut-num:            AS200201
+as-name:            JOT23-GLOBAL
+descr:              JOT23 global sites
+remarks:            +--------------------+-------------------------------+
+remarks:            | Server             | Location                      |
+remarks:            +--------------------+-------------------------------+
+remarks:            | site-02.421199.xyz | Bissen, Luxembourg            |
+remarks:            | site-03.421199.xyz | Phoenix, AZ, USA              |
+remarks:            +--------------------+-------------------------------+
+admin-c:            TOMKEP-DN42
+tech-c:             TOMKEP-DN42
+mnt-by:             TOMKEP-MNT
+source:             RIPE
diff --git a/data/aut-num/AS212888 b/data/aut-num/AS212888
new file mode 100644
index 000000000..96cbd5987
--- /dev/null
+++ b/data/aut-num/AS212888
@@ -0,0 +1,15 @@
+aut-num:            AS212888
+as-name:            JOT23-HOME
+descr:              JOT23 home network
+remarks:            +----------------------------------------------------+
+remarks:            | This is home network on residential line.          |
+remarks:            | This is leaf node and it does not provide transit. |
+remarks:            +--------------------+-------------------------------+
+remarks:            | Server             | Location                      |
+remarks:            +--------------------+-------------------------------+
+remarks:            | site-01.421198.xyz | Gdańsk, Poland                |
+remarks:            +--------------------+-------------------------------+
+admin-c:            TOMKEP-DN42
+tech-c:             TOMKEP-DN42
+mnt-by:             TOMKEP-MNT
+source:             RIPE
diff --git a/data/aut-num/AS4242421198 b/data/aut-num/AS4242421198
index 76cce5e71..3f5905e40 100644
--- a/data/aut-num/AS4242421198
+++ b/data/aut-num/AS4242421198
@@ -1,5 +1,5 @@
 aut-num:            AS4242421198
-as-name:            JOT23-HOME-AS
+as-name:            JOT23-HOME
 descr:              JOT23 home network
 remarks:            +----------------------------------------------------+
 remarks:            | This is home network on residential line.          |
diff --git a/data/aut-num/AS4242421199 b/data/aut-num/AS4242421199
index d104a131a..634176d97 100644
--- a/data/aut-num/AS4242421199
+++ b/data/aut-num/AS4242421199
@@ -1,5 +1,12 @@
 aut-num:            AS4242421199
-as-name:            JOT23-GLOBAL-AS
+as-name:            JOT23-GLOBAL
+descr:              JOT23 global sites
+remarks:            +--------------------+-------------------------------+
+remarks:            | Server             | Location                      |
+remarks:            +--------------------+-------------------------------+
+remarks:            | site-02.421199.xyz | Bissen, Luxembourg            |
+remarks:            | site-03.421199.xyz | Phoenix, AZ, USA              |
+remarks:            +--------------------+-------------------------------+
 admin-c:            TOMKEP-DN42
 tech-c:             TOMKEP-DN42
 mnt-by:             TOMKEP-MNT
diff --git a/data/inet6num/fdb1:8565:c849::_48 b/data/inet6num/fdb1:8565:c849::_48
index cf610aa87..8639d86dd 100644
--- a/data/inet6num/fdb1:8565:c849::_48
+++ b/data/inet6num/fdb1:8565:c849::_48
@@ -1,6 +1,6 @@
 inet6num:           fdb1:8565:c849:0000:0000:0000:0000:0000 - fdb1:8565:c849:ffff:ffff:ffff:ffff:ffff
 cidr:               fdb1:8565:c849::/48
-netname:            JOT23-GLOBAL-NET
+netname:            JOT23-GLOBAL
 admin-c:            TOMKEP-DN42
 tech-c:             TOMKEP-DN42
 mnt-by:             TOMKEP-MNT
diff --git a/data/inet6num/fddd:fdef:2ea1::_48 b/data/inet6num/fddd:fdef:2ea1::_48
index 7fe05d131..f31210abf 100644
--- a/data/inet6num/fddd:fdef:2ea1::_48
+++ b/data/inet6num/fddd:fdef:2ea1::_48
@@ -1,6 +1,6 @@
 inet6num:           fddd:fdef:2ea1:0000:0000:0000:0000:0000 - fddd:fdef:2ea1:ffff:ffff:ffff:ffff:ffff
 cidr:               fddd:fdef:2ea1::/48
-netname:            JOT23-HOME-NET
+netname:            JOT23-HOME
 country:            PL
 admin-c:            TOMKEP-DN42
 tech-c:             TOMKEP-DN42
diff --git a/data/route/172.23.43.0_28 b/data/route/172.23.43.0_28
index 7a40d9b15..53ed46c93 100644
--- a/data/route/172.23.43.0_28
+++ b/data/route/172.23.43.0_28
@@ -1,5 +1,7 @@
 route:              172.23.43.0/28
-descr:              JOT23 NAT64 IPv4 route
+descr:              JOT23 HOME NAT64 IPv4 route
+origin:             AS212888
+remarks:            ~~~ AS4242421198 to be dropped once AS212888 goes live. ~~~
 origin:             AS4242421198
 mnt-by:             TOMKEP-MNT
 source:             DN42
diff --git a/data/route6/fdb1:8565:c849::_48 b/data/route6/fdb1:8565:c849::_48
index ebda7a1cc..bfc8b800a 100644
--- a/data/route6/fdb1:8565:c849::_48
+++ b/data/route6/fdb1:8565:c849::_48
@@ -1,5 +1,7 @@
 route6:             fdb1:8565:c849::/48
 pingable:           fdb1:8565:c849::1
+origin:             AS200201
+remarks:            ~~~ AS4242421199 to be dropped once AS200201 goes live. ~~~
 origin:             AS4242421199
 mnt-by:             TOMKEP-MNT
 source:             DN42
diff --git a/data/route6/fddd:fdef:2ea1::_48 b/data/route6/fddd:fdef:2ea1::_48
index 727cfe2b0..f8b0b631a 100644
--- a/data/route6/fddd:fdef:2ea1::_48
+++ b/data/route6/fddd:fdef:2ea1::_48
@@ -1,5 +1,7 @@
 route6:             fddd:fdef:2ea1::/48
 pingable:           fddd:fdef:2ea1::1
+origin:             AS212888
+remarks:            ~~~ AS4242421198 to be dropped once AS212888 goes live. ~~~
 origin:             AS4242421198
 mnt-by:             TOMKEP-MNT
 source:             DN42