diff --git a/data/as-set/AS-MAGICNEKO b/data/as-set/AS-MAGICNEKO
new file mode 100644
index 000000000..f899bc507
--- /dev/null
+++ b/data/as-set/AS-MAGICNEKO
@@ -0,0 +1,8 @@
+as-set:             AS-MAGICNEKO
+descr:              MAGICNEKO-ALL
+members:            AS-HENTAI
+members:            AS4201270005
+members:            AS4201270008
+members:            AS141706
+mnt-by:             ICECAT-MNT
+source:             DN42
diff --git a/data/aut-num/AS140913 b/data/aut-num/AS140913
index e842108b0..3359bbfdd 100644
--- a/data/aut-num/AS140913
+++ b/data/aut-num/AS140913
@@ -1,14 +1,14 @@
 aut-num:            AS140913
-as-name:            Hentai Network
+as-name:            HENTAI-AS-AP
 descr:              Hentai Network
 remarks:            ----------------------------------------------------------
 mp-import:          afi ipv4.unicast from AS-ANY accept ANY
-mp-export:          afi ipv4.unicast to AS-ANY   announce AS-HENTAI
+mp-export:          afi ipv4.unicast to AS-ANY   announce AS-MAGICNEKO
 mp-import:          afi ipv6.unicast from AS-ANY accept ANY
-mp-export:          afi ipv6.unicast to AS-ANY   announce AS-HENTAI
+mp-export:          afi ipv6.unicast to AS-ANY   announce AS-MAGICNEKO
 remarks:            ----------------------------------------------------------
-admin-c:            ICECAT-DN42
+admin-c:            MAGICNEKO-NEONETWORK
 tech-c:             ICECAT-DN42
 mnt-by:             ICECAT-MNT
-org:                ORG-NEXTMOE
+org:                ORG-MAGICNEKO
 source:             APNIC
diff --git a/data/aut-num/AS141706 b/data/aut-num/AS141706
new file mode 100644
index 000000000..0335be63e
--- /dev/null
+++ b/data/aut-num/AS141706
@@ -0,0 +1,14 @@
+aut-num:            AS141706
+as-name:            KOISHI-NETWORK-AS-AP
+descr:              Koishi Network
+remarks:            ----------------------------------------------------------
+mp-import:          afi ipv4.unicast from AS140913 accept ANY
+mp-export:          afi ipv4.unicast to AS140913   announce AS-MAGICNEKO
+mp-import:          afi ipv6.unicast from AS140913 accept ANY
+mp-export:          afi ipv6.unicast to AS140913   announce AS-MAGICNEKO
+remarks:            ----------------------------------------------------------
+admin-c:            ICECAT-DN42
+tech-c:             ICECAT-DN42
+mnt-by:             ICECAT-MNT
+org:                ORG-MAGICNEKO
+source:             APNIC
diff --git a/data/aut-num/AS4242421025 b/data/aut-num/AS4242421025
index a6e110186..72dc6ff8b 100644
--- a/data/aut-num/AS4242421025
+++ b/data/aut-num/AS4242421025
@@ -1,19 +1,15 @@
 aut-num:            AS4242421025
-as-name:            NextMoe Neo-Network Intermediate Access Project
-descr:              NextMoe Group Intermediate Access Project
+as-name:            AS-CATSTAR
+descr:              CatStar Network Access Project
 remarks:            ----------------------------------------------------------
-remarks:            The intermediate access engineering service provided
-remarks:            for NeoNetwork is currently in the test period
-remarks:            if you need peer-to-peer interconnection
-remarks:            please look for Telegram@fakeicecat
-remarks:            The ASN is the only upstream of 4201270008
+remarks:            
 remarks:            ----------------------------------------------------------
 mp-import:          afi ipv4.unicast from AS-ANY accept ANY
-mp-export:          afi ipv4.unicast to AS-ANY   announce AS-HENTAI
+mp-export:          afi ipv4.unicast to AS-ANY   announce AS-MAGICNEKO
 mp-import:          afi ipv6.unicast from AS-ANY accept ANY
-mp-export:          afi ipv6.unicast to AS-ANY   announce AS-HENTAI
-admin-c:            ICECAT-DN42
+mp-export:          afi ipv6.unicast to AS-ANY   announce AS-MAGICNEKO
+admin-c:            MAGICNEKO-NEONETWORK
 tech-c:             ICECAT-DN42
 mnt-by:             ICECAT-MNT
-org:                ORG-NEXTMOE
+org:                ORG-MAGICNEKO
 source:             DN42
diff --git a/data/organisation/ORG-MAGICNEKO b/data/organisation/ORG-MAGICNEKO
new file mode 100644
index 000000000..6d2d07b57
--- /dev/null
+++ b/data/organisation/ORG-MAGICNEKO
@@ -0,0 +1,8 @@
+organisation:       ORG-MAGICNEKO
+org-name:           MAGICNEKO
+descr:              MagicNeko Group
+e-mail:             noc@koishi.moe
+admin-c:            MAGICNEKO-NEONETWORK
+tech-c:             ICECAT-DN42
+mnt-by:             ICECAT-MNT
+source:             DN42
diff --git a/data/organisation/ORG-NEXTMOE b/data/organisation/ORG-NEXTMOE
deleted file mode 100644
index cd4afea6d..000000000
--- a/data/organisation/ORG-NEXTMOE
+++ /dev/null
@@ -1,8 +0,0 @@
-organisation:       ORG-NEXTMOE
-org-name:           NextMoe Group
-descr:              NextMoe Group Intermediate Access Project
-e-mail:             icecat@catio.network
-admin-c:            ICECAT-DN42
-tech-c:             ICECAT-DN42
-mnt-by:             ICECAT-MNT
-source:             DN42
diff --git a/data/person/ICECAT-DN42 b/data/person/ICECAT-DN42
index 05274d24c..1e1aac081 100644
--- a/data/person/ICECAT-DN42
+++ b/data/person/ICECAT-DN42
@@ -1,5 +1,5 @@
 person:             Icecat
-contact:            icecat@catio.network
+contact:            icecat@koishi.moe
 nic-hdl:            ICECAT-DN42
 mnt-by:             ICECAT-MNT
 source:             DN42