diff --git a/nodes/fsn1/bird2/bird/peers/AS4242423078_hexanet.conf b/nodes/fsn1/bird2/bird/peers/AS4242423078_hexanet.conf
new file mode 100644
index 0000000..df2844a
--- /dev/null
+++ b/nodes/fsn1/bird2/bird/peers/AS4242423078_hexanet.conf
@@ -0,0 +1,3 @@
+protocol bgp AS4242423078_hexanet_v6 from dnpeers {
+        neighbor fe80::c:3621%dn42p7 as 4242423078;
+}
diff --git a/nodes/fsn1/bird2/bird/roa_dn42.conf b/nodes/fsn1/bird2/bird/roa_dn42.conf
index 05583b5..5405ac7 100644
--- a/nodes/fsn1/bird2/bird/roa_dn42.conf
+++ b/nodes/fsn1/bird2/bird/roa_dn42.conf
@@ -1,10 +1,10 @@
-# Updated at Fri Mar 27 17:32:16 MST 2020
-#commit 83cf7b7239bbc7a418c5833961d1682164b495b6
-#Merge: 66cb464 51658e9
+# Updated at Thu Apr  9 04:32:16 MST 2020
+#commit 04aa414e4048373bcc3ccd90294ae1fc78812656
+#Merge: 3417f58 d5b9613
 #Author: burble <simon@burble.com>
-#Date:   Fri Mar 27 23:41:25 2020 +0000
+#Date:   Thu Apr 9 07:11:40 2020 +0000
 #
-#    Merge branch 'master' of haha662/registry into master
+#    Merge branch 'master' of syllabear/registry into master
 route 10.0.0.0/16 max 29 as 65079;
 route 10.100.0.0/14 max 29 as 64654;
 route 10.100.0.0/14 max 29 as 4242422718;
@@ -186,7 +186,7 @@ route 10.90.0.0/16 max 29 as 65190;
 route 10.99.0.0/16 max 29 as 65099;
 route 172.20.0.35/32 max 32 as 4242420656;
 route 172.20.0.53/32 max 32 as 4242420119;
-route 172.20.0.53/32 max 32 as 4242422601;
+route 172.20.0.53/32 max 32 as 4242423914;
 route 172.20.10.0/26 max 29 as 4242421406;
 route 172.20.10.128/29 max 29 as 4242423369;
 route 172.20.1.0/24 max 24 as 4242420119;
@@ -298,6 +298,8 @@ route 172.20.158.0/27 max 29 as 206633;
 route 172.20.158.128/26 max 29 as 4242421331;
 route 172.20.158.32/27 max 29 as 4242421629;
 route 172.20.158.64/27 max 29 as 4242422541;
+route 172.20.158.64/27 max 29 as 4242422545;
+route 172.20.158.96/27 max 29 as 4242423468;
 route 172.20.159.0/29 max 29 as 4242422878;
 route 172.20.159.160/27 max 29 as 4242421709;
 route 172.20.159.16/28 max 29 as 4242421055;
@@ -342,6 +344,7 @@ route 172.20.170.160/28 max 29 as 4242422161;
 route 172.20.170.192/27 max 29 as 4242423934;
 route 172.20.170.224/27 max 29 as 4242420157;
 route 172.20.171.0/26 max 29 as 4242420125;
+route 172.20.171.160/27 max 29 as 4242422103;
 route 172.20.171.80/28 max 29 as 4242421564;
 route 172.20.171.96/27 max 29 as 4242420211;
 route 172.20.172.0/28 max 29 as 4242423160;
@@ -394,6 +397,7 @@ route 172.20.184.160/28 max 29 as 4242421788;
 route 172.20.184.192/28 max 29 as 4242420078;
 route 172.20.184.208/28 max 29 as 4242420078;
 route 172.20.184.224/28 max 29 as 4242420078;
+route 172.20.184.240/29 max 29 as 4242420661;
 route 172.20.184.32/27 max 29 as 4242423884;
 route 172.20.186.0/24 max 29 as 4242421588;
 route 172.20.18.64/27 max 29 as 4242423754;
@@ -462,6 +466,7 @@ route 172.20.224.0/26 max 29 as 4242422284;
 route 172.20.224.64/27 max 29 as 4242421070;
 route 172.20.224.96/27 max 29 as 4242421987;
 route 172.20.227.0/27 max 29 as 4242423965;
+route 172.20.227.112/28 max 29 as 4242423636;
 route 172.20.227.128/27 max 29 as 4242422543;
 route 172.20.227.160/28 max 29 as 4242429990;
 route 172.20.227.192/27 max 29 as 4242420058;
@@ -552,6 +557,7 @@ route 172.20.39.96/27 max 29 as 4242423615;
 route 172.20.40.0/24 max 29 as 4242420124;
 route 172.20.4.0/27 max 29 as 4242421199;
 route 172.20.41.0/27 max 29 as 4242422381;
+route 172.20.4.112/28 max 29 as 4242420194;
 route 172.20.4.128/26 max 29 as 4242420049;
 route 172.20.41.32/28 max 29 as 4242420208;
 route 172.20.41.64/27 max 29 as 4242421019;
@@ -640,6 +646,7 @@ route 172.20.66.64/28 max 29 as 4242420101;
 route 172.20.6.96/29 max 29 as 4242420981;
 route 172.20.72.0/21 max 29 as 4242421127;
 route 172.20.8.0/23 max 29 as 4242423201;
+route 172.21.0.53/32 max 32 as 0;
 route 172.21.100.0/28 max 29 as 4242423737;
 route 172.21.100.128/25 max 29 as 4242423088;
 route 172.21.100.32/27 max 29 as 4242428988;
@@ -681,6 +688,7 @@ route 172.21.64.64/27 max 29 as 4242421116;
 route 172.21.64.96/27 max 29 as 4242422065;
 route 172.21.65.0/27 max 29 as 4242420778;
 route 172.21.65.32/28 max 29 as 4242422379;
+route 172.21.65.48/28 max 29 as 4242421690;
 route 172.21.65.64/29 max 29 as 4242423999;
 route 172.21.66.128/27 max 29 as 4242423886;
 route 172.21.66.64/27 max 29 as 4242423955;
@@ -688,6 +696,7 @@ route 172.21.66.96/27 max 29 as 4242422809;
 route 172.21.67.0/27 max 29 as 4242420167;
 route 172.21.67.128/28 max 29 as 4242423010;
 route 172.21.67.32/27 max 29 as 4242420339;
+route 172.21.67.64/27 max 29 as 4242420807;
 route 172.21.69.0/24 max 29 as 4242423931;
 route 172.21.70.0/23 max 29 as 4242423158;
 route 172.21.74.0/27 max 29 as 4242423454;
@@ -700,6 +709,7 @@ route 172.21.79.0/26 max 29 as 4242421500;
 route 172.21.79.64/28 max 29 as 4242421873;
 route 172.21.79.80/28 max 29 as 4242420186;
 route 172.21.79.96/27 max 29 as 4242422773;
+route 172.21.80.0/26 max 29 as 4242422077;
 route 172.21.84.0/27 max 29 as 4242422381;
 route 172.21.84.32/27 max 29 as 4242420885;
 route 172.21.84.64/27 max 29 as 4242423919;
@@ -725,13 +735,11 @@ route 172.21.99.96/27 max 29 as 4242422232;
 route 172.22.0.43/32 max 32 as 4242420101;
 route 172.22.0.43/32 max 32 as 4242420013;
 route 172.22.0.43/32 max 32 as 4242423723;
-route 172.22.0.53/32 max 32 as 64737;
-route 172.22.0.53/32 max 32 as 4242420123;
-route 172.22.0.53/32 max 32 as 4242420321;
-route 172.22.0.53/32 max 32 as 4242420022;
+route 172.22.0.53/32 max 32 as 0;
 route 172.22.0.94/32 max 32 as 56662;
 route 172.22.0.94/32 max 32 as 4242420077;
 route 172.22.0.94/32 max 32 as 4242420022;
+route 172.22.0.94/32 max 32 as 4242421050;
 route 172.22.100.0/24 max 29 as 64698;
 route 172.22.101.0/27 max 29 as 4242420152;
 route 172.22.101.200/29 max 29 as 4242422027;
@@ -787,6 +795,7 @@ route 172.22.127.0/26 max 29 as 4242420140;
 route 172.22.127.128/25 max 29 as 4242422277;
 route 172.22.127.64/27 max 29 as 4242422227;
 route 172.22.127.96/27 max 29 as 4242420076;
+route 172.22.128.0/27 max 29 as 31867;
 route 172.22.128.128/27 max 29 as 4242420185;
 route 172.22.128.64/28 max 29 as 4242420553;
 route 172.22.129.0/28 max 29 as 4242421702;
@@ -933,12 +942,8 @@ route 172.22.98.0/28 max 29 as 4242420019;
 route 172.22.99.0/24 max 29 as 64699;
 route 172.23.0.20/32 max 32 as 64719;
 route 172.23.0.32/28 max 29 as 4242420321;
-route 172.23.0.53/32 max 32 as 4242420022;
 route 172.23.0.53/32 max 32 as 64737;
-route 172.23.0.53/32 max 32 as 4242420123;
-route 172.23.0.53/32 max 32 as 4242420122;
-route 172.23.0.53/32 max 32 as 76198;
-route 172.23.0.53/32 max 32 as 4242423723;
+route 172.23.0.53/32 max 32 as 4242422601;
 route 172.23.0.80/32 max 32 as 4242420123;
 route 172.23.0.80/32 max 32 as 64737;
 route 172.23.0.80/32 max 32 as 64719;
@@ -1007,6 +1012,7 @@ route 172.23.162.0/27 max 29 as 4242422890;
 route 172.23.163.0/27 max 29 as 4242421200;
 route 172.23.163.128/27 max 29 as 4242421289;
 route 172.23.163.192/26 max 29 as 4242423941;
+route 172.23.163.32/27 max 29 as 4242420251;
 route 172.23.164.0/23 max 29 as 76160;
 route 172.23.168.0/25 max 29 as 4242423924;
 route 172.23.168.128/27 max 29 as 4242421518;
@@ -1066,6 +1072,7 @@ route 172.23.222.64/27 max 29 as 4242422027;
 route 172.23.223.0/27 max 29 as 4242422028;
 route 172.23.223.96/27 max 29 as 4242423794;
 route 172.23.230.0/26 max 29 as 4242423921;
+route 172.23.230.64/26 max 29 as 4242421824;
 route 172.23.231.0/26 max 29 as 4242422037;
 route 172.23.233.0/24 max 29 as 4242422244;
 route 172.23.234.0/28 max 29 as 4242423852;
@@ -1085,6 +1092,7 @@ route 172.23.239.128/25 max 29 as 4242422877;
 route 172.23.240.32/27 max 29 as 4242420525;
 route 172.23.241.0/26 max 29 as 4242420252;
 route 172.23.245.0/24 max 29 as 76175;
+route 172.23.248.160/27 max 29 as 4242420225;
 route 172.23.248.192/28 max 29 as 4242422480;
 route 172.23.248.224/28 max 29 as 4242422481;
 route 172.23.249.0/24 max 29 as 4242421338;
@@ -1113,6 +1121,8 @@ route 172.23.56.0/24 max 29 as 4242420018;
 route 172.23.57.0/28 max 29 as 4242421905;
 route 172.23.60.128/25 max 29 as 4242423158;
 route 172.23.63.0/24 max 29 as 4242423006;
+route 172.23.64.0/25 max 29 as 4242421375;
+route 172.23.64.128/25 max 29 as 4242421374;
 route 172.23.67.0/25 max 29 as 4242420022;
 route 172.23.73.0/26 max 29 as 4242421823;
 route 172.23.76.0/26 max 29 as 4242422305;
diff --git a/nodes/fsn1/bird2/bird/roa_dn42_v6.conf b/nodes/fsn1/bird2/bird/roa_dn42_v6.conf
index 28018ef..ac600d5 100644
--- a/nodes/fsn1/bird2/bird/roa_dn42_v6.conf
+++ b/nodes/fsn1/bird2/bird/roa_dn42_v6.conf
@@ -1,10 +1,10 @@
-# Updated at Fri Mar 27 17:32:16 MST 2020
-#commit 83cf7b7239bbc7a418c5833961d1682164b495b6
-#Merge: 66cb464 51658e9
+# Updated at Thu Apr  9 04:32:16 MST 2020
+#commit 04aa414e4048373bcc3ccd90294ae1fc78812656
+#Merge: 3417f58 d5b9613
 #Author: burble <simon@burble.com>
-#Date:   Fri Mar 27 23:41:25 2020 +0000
+#Date:   Thu Apr 9 07:11:40 2020 +0000
 #
-#    Merge branch 'master' of haha662/registry into master
+#    Merge branch 'master' of syllabear/registry into master
 route fd00:0801:3000::/40 max 64 as 4242420656;
 route fd00:0801:3000::/44 max 64 as 4242420656;
 route fd00:0801:3010::/44 max 64 as 4242420656;
@@ -41,6 +41,7 @@ route fd00:aaaa:256::/48 max 64 as 4242420117;
 route fd00:abcd:e:0100::/56 max 64 as 4242420198;
 route fd00:abcd:e::/48 max 64 as 4242420158;
 route fd00:b709::/48 max 64 as 4242421103;
+route fd00:bad:a55::/48 max 64 as 31867;
 route fd00:bad:b00b::/64 max 64 as 4242420467;
 route fd00:bad:c0de::/48 max 64 as 4242420206;
 route fd00:bad:f00d::/48 max 64 as 4242420899;
@@ -62,6 +63,7 @@ route fd01:470:7d4c::/48 max 64 as 64600;
 route fd01:470:f129::/48 max 64 as 4242422299;
 route fd01:5e19:11e1::/48 max 64 as 4242422506;
 route fd01:67c:2ed8::/48 max 64 as 65038;
+route fd03:4de4:6baa::/48 max 64 as 4242420309;
 route fd03:7e46:2707::/48 max 64 as 4242421928;
 route fd04:52c0:4000::/48 max 64 as 4242423585;
 route fd05:3aca:c3a0:a2c1::/64 max 64 as 0;
@@ -71,6 +73,7 @@ route fd05:a2d1:a767::/48 max 48 as 4242422237;
 route fd06:8187:fb00::/40 max 64 as 65026;
 route fd06:b047:f7de::/48 max 64 as 64872;
 route fd06:e881:1300::/44 max 64 as 4242420842;
+route fd07:0369:6502::/48 max 48 as 4242423468;
 route fd07:0d34:7969::/48 max 48 as 4242423618;
 route fd07:96ae:572e::/48 max 64 as 64901;
 route fd08:a855:d4c7::/48 max 64 as 4242423027;
@@ -274,6 +277,7 @@ route fd42:42:2166::/48 max 64 as 4242423141;
 route fd42:4242:0339::/48 max 64 as 4242420339;
 route fd42:4242:0815::/48 max 64 as 4242420815;
 route fd42:4242:1337::/48 max 64 as 4242420414;
+route fd42:4242:1375::/48 max 64 as 4242421375;
 route fd42:4242:17::/48 max 64 as 4242420017;
 route fd42:4242:1842::/48 max 64 as 4242421842;
 route fd42:4242:1921::/48 max 64 as 4242421921;
@@ -307,6 +311,7 @@ route fd42:4992:6b6f::/48 max 64 as 4242428202;
 route fd42:4992:acbd::/48 max 64 as 4242423504;
 route fd42:4999:6a6d::/48 max 64 as 4242420302;
 route fd42:4dd0:ff00::/48 max 64 as 4242422428;
+route fd42:4f81:ecf4::/48 max 48 as 4242421824;
 route fd42:53fb:543a::/48 max 64 as 4242421408;
 route fd42:5aaf:9fe8::/48 max 64 as 4242420666;
 route fd42:5d71:219::/48 max 48 as 4242420119;
@@ -385,18 +390,16 @@ route fd42:d42:d42:43::/64 max 64 as 4242420013;
 route fd42:d42:d42:43::/64 max 64 as 4242423723;
 route fd42:d42:d42::/48 max 64 as 64737;
 route fd42:d42:d42:53::/64 max 64 as 64737;
-route fd42:d42:d42:53::/64 max 64 as 4242420022;
-route fd42:d42:d42:53::/64 max 64 as 4242423955;
-route fd42:d42:d42:53::/64 max 64 as 4242420123;
-route fd42:d42:d42:53::/64 max 64 as 4242423723;
+route fd42:d42:d42:53::/64 max 64 as 4242422601;
 route fd42:d42:d42:54::/64 max 64 as 4242420119;
-route fd42:d42:d42:54::/64 max 64 as 4242422601;
+route fd42:d42:d42:54::/64 max 64 as 4242423914;
 route fd42:d42:d42:6667::/64 max 64 as 64600;
 route fd42:d42:d42:6667::/64 max 64 as 4242420101;
 route fd42:d42:d42:80::/64 max 64 as 64737;
 route fd42:d42:d42:80::/64 max 64 as 4242420123;
 route fd42:d42:d42:80::/64 max 64 as 64719;
 route fd42:d42:d42:80::/64 max 64 as 4242422601;
+route fd42:d42:d42:9001::/64 max 64 as 4242421050;
 route fd42:d42:d42:9050::/64 max 64 as 4242420022;
 route fd42:d42:d42:9050::/64 max 64 as 4242420077;
 route fd42:d447:775c::/48 max 48 as 4242421070;
@@ -410,6 +413,7 @@ route fd42:dee:dee::/48 max 64 as 4242423424;
 route fd42:df42::/48 max 64 as 64773;
 route fd42:e0f1:5b4b::/48 max 64 as 4242420164;
 route fd42:e9ad:e297::/48 max 64 as 4242421369;
+route fd42:ec20:4ef1::/48 max 64 as 4242421488;
 route fd42:eef1:47b5::/48 max 64 as 4242420239;
 route fd42:f10:411::/48 max 64 as 4242422100;
 route fd42:f10:a15::/48 max 64 as 4242422100;
@@ -498,9 +502,6 @@ route fd62:7eab:c85f::/48 max 64 as 4242422681;
 route fd62:a393:3d91::/48 max 64 as 4242421128;
 route fd62:cc46:576b::/48 max 64 as 4242422809;
 route fd62:cd4d:28a1::/48 max 48 as 4242420173;
-route fd63:1e39:6f73:2929::/64 max 64 as 64654;
-route fd63:1e39:6f73:2929::/64 max 64 as 4242422718;
-route fd63:1e39:6f73:2929::/64 max 64 as 4242422480;
 route fd63:1e39:6f73::/48 max 64 as 64697;
 route fd63:1e39:6f73::/48 max 64 as 64766;
 route fd64:cafe:cafe::/48 max 64 as 4242423400;
@@ -569,9 +570,11 @@ route fd83:e002:c8a1::/48 max 64 as 64525;
 route fd84:688d:22bb::/48 max 64 as 4242423932;
 route fd85:050d:222d::/48 max 48 as 4242423954;
 route fd85:1dea:2093::/48 max 64 as 4242421009;
+route fd85:7370:a8a1::/48 max 48 as 4242421690;
 route fd86:4169:1552::/48 max 48 as 4242420823;
 route fd86:b4dc:4b1e::/48 max 64 as 65037;
 route fd86:bc21:638a::/48 max 64 as 4242420674;
+route fd88:1926:817::/48 max 64 as 4242420251;
 route fd88:2e46:4b1c:5988::/64 max 64 as 4242420017;
 route fd88:4903:4b9f:d66f::/64 max 64 as 4242420017;
 route fd88:8888:abcd::/48 max 64 as 4242420448;
@@ -610,12 +613,14 @@ route fd9a:d414:cf1c::/48 max 64 as 4242420248;
 route fd9a:f34d:4541::/48 max 64 as 4242422200;
 route fd9b:8277:c31a::/48 max 64 as 4242423320;
 route fd9b:d633:d173::/48 max 64 as 4242422037;
+route fd9c:bee3:3694::/48 max 64 as 4242420225;
 route fd9c:cab6:54f3::/48 max 64 as 4242421775;
 route fd9d:5e08:b9f9::/48 max 64 as 4242421096;
 route fd9d:5e08:b9f9:c3::/64 max 64 as 64654;
 route fd9d:5e08:b9f9:c3::/64 max 64 as 4242422718;
 route fd9d:5e08:b9f9:c3::/64 max 64 as 4242422480;
 route fd9e:2c7c:fea6::/47 max 64 as 4242422228;
+route fd9e:b565:def3::/48 max 48 as 4242423565;
 route fd9e:e609:dde2::/48 max 48 as 4242422251;
 route fd9f:1630:5351::/48 max 64 as 4242423557;
 route fda0:23:1f05:1::/64 max 64 as 4242423514;
@@ -652,6 +657,7 @@ route fda5:ac02:e120::/48 max 48 as 4242422369;
 route fda5:f049:ddcc::/48 max 48 as 4242420196;
 route fda6:2474:15a4::/48 max 48 as 4242423078;
 route fda6:9506:01d5::/48 max 64 as 4242422541;
+route fda6:9506:01d5::/48 max 64 as 4242422545;
 route fda7:a975:bfc2::/48 max 64 as 4242420469;
 route fda7:c947:6d13::/48 max 64 as 4242420415;
 route fda7:e8fa:a57f::/48 max 64 as 4242423211;
@@ -670,6 +676,7 @@ route fdac:f3f:e7e2::/48 max 64 as 4242422333;
 route fdac:f820:373a::/48 max 64 as 4242422128;
 route fdad:850e:9f6a:9cb3::/64 max 64 as 4242420190;
 route fdae:e2d8:34a1::/48 max 64 as 4242420756;
+route fdae:e3cd:11d9::/48 max 48 as 4242420807;
 route fdb1:e72a:343d::/48 max 64 as 4242420207;
 route fdb2:520f:f4a7::/48 max 64 as 4242423774;
 route fdb2:a999:7f8c::/48 max 48 as 4242422389;
@@ -709,6 +716,7 @@ route fdc0:bc88:be::/48 max 64 as 4242421811;
 route fdc0:f16e:7051::/48 max 64 as 4242423567;
 route fdc1:31f:b14f::/48 max 64 as 64720;
 route fdc1:d4b:b89a::/48 max 64 as 4242423556;
+route fdc2:752c:29d1::/48 max 48 as 4242423636;
 route fdc3:10cd:ae9b::/48 max 64 as 4242420789;
 route fdc3:10cd:ae9c::/48 max 64 as 4242420789;
 route fdc3:10cd:ae9d::/48 max 64 as 4242420789;
@@ -758,6 +766,8 @@ route fdcf:3c00:e001::/48 max 64 as 4242422287;
 route fdcf:7494:4f2c::/48 max 64 as 4242420813;
 route fdcf:8538:9ad5::/48 max 64 as 4242423914;
 route fdcf:de54:13ef::/48 max 64 as 4242421508;
+route fdd0:17ea:3a52::/48 max 64 as 4242420194;
+route fdd0:77f2:44de::/48 max 48 as 4242422077;
 route fdd0:c468:8eb1::/48 max 64 as 4242423843;
 route fdd1:1c64:66fd::/48 max 64 as 4242421233;
 route fdd1:1c64:66fd::/58 max 64 as 4242421233;
@@ -803,6 +813,7 @@ route fde3:a7e3:7957::/48 max 64 as 4242423004;
 route fde4:2355:54fe::/48 max 48 as 4242420185;
 route fde6:36fc:c985::/64 max 64 as 65527;
 route fde6:402d:990d::/48 max 64 as 4242420576;
+route fde6:dee3:615d::/48 max 48 as 4242422103;
 route fde7:32ae:ee77::/48 max 64 as 4242422777;
 route fde7:56e7:ead3::/48 max 64 as 4242420246;
 route fde7:76fd:7444::/48 max 64 as 4242420157;
diff --git a/nodes/fsn1/systemd-networkd/dn42p7.netdev b/nodes/fsn1/systemd-networkd/dn42p7.netdev
new file mode 100644
index 0000000..b85121c
--- /dev/null
+++ b/nodes/fsn1/systemd-networkd/dn42p7.netdev
@@ -0,0 +1,13 @@
+[NetDev]
+Name = dn42p7
+Kind = wireguard
+Description = WireGuard
+
+[WireGuard]
+ListenPort = 42427
+PrivateKeyFile = /etc/wireguard/private.key
+
+[WireGuardPeer]
+PublicKey = 5XpUor03B3DBHIMx0Z4ufOg7qCGtBqlYXfraRqncRlI=
+Endpoint = 116.202.176.182:32341
+AllowedIPs = 172.16.0.0/12,10.0.0.0/8,fd00::/8,fe80::/10,ff00::/8
diff --git a/nodes/fsn1/systemd-networkd/dn42p7.network b/nodes/fsn1/systemd-networkd/dn42p7.network
new file mode 100644
index 0000000..995a518
--- /dev/null
+++ b/nodes/fsn1/systemd-networkd/dn42p7.network
@@ -0,0 +1,6 @@
+[Match]
+Name = dn42p7
+
+[Address]
+Address = fe80::2342/128
+Peer = fe80::c:3621/128
diff --git a/nodes/fsn2/bird2/bird/roa_dn42.conf b/nodes/fsn2/bird2/bird/roa_dn42.conf
index 05583b5..5405ac7 100644
--- a/nodes/fsn2/bird2/bird/roa_dn42.conf
+++ b/nodes/fsn2/bird2/bird/roa_dn42.conf
@@ -1,10 +1,10 @@
-# Updated at Fri Mar 27 17:32:16 MST 2020
-#commit 83cf7b7239bbc7a418c5833961d1682164b495b6
-#Merge: 66cb464 51658e9
+# Updated at Thu Apr  9 04:32:16 MST 2020
+#commit 04aa414e4048373bcc3ccd90294ae1fc78812656
+#Merge: 3417f58 d5b9613
 #Author: burble <simon@burble.com>
-#Date:   Fri Mar 27 23:41:25 2020 +0000
+#Date:   Thu Apr 9 07:11:40 2020 +0000
 #
-#    Merge branch 'master' of haha662/registry into master
+#    Merge branch 'master' of syllabear/registry into master
 route 10.0.0.0/16 max 29 as 65079;
 route 10.100.0.0/14 max 29 as 64654;
 route 10.100.0.0/14 max 29 as 4242422718;
@@ -186,7 +186,7 @@ route 10.90.0.0/16 max 29 as 65190;
 route 10.99.0.0/16 max 29 as 65099;
 route 172.20.0.35/32 max 32 as 4242420656;
 route 172.20.0.53/32 max 32 as 4242420119;
-route 172.20.0.53/32 max 32 as 4242422601;
+route 172.20.0.53/32 max 32 as 4242423914;
 route 172.20.10.0/26 max 29 as 4242421406;
 route 172.20.10.128/29 max 29 as 4242423369;
 route 172.20.1.0/24 max 24 as 4242420119;
@@ -298,6 +298,8 @@ route 172.20.158.0/27 max 29 as 206633;
 route 172.20.158.128/26 max 29 as 4242421331;
 route 172.20.158.32/27 max 29 as 4242421629;
 route 172.20.158.64/27 max 29 as 4242422541;
+route 172.20.158.64/27 max 29 as 4242422545;
+route 172.20.158.96/27 max 29 as 4242423468;
 route 172.20.159.0/29 max 29 as 4242422878;
 route 172.20.159.160/27 max 29 as 4242421709;
 route 172.20.159.16/28 max 29 as 4242421055;
@@ -342,6 +344,7 @@ route 172.20.170.160/28 max 29 as 4242422161;
 route 172.20.170.192/27 max 29 as 4242423934;
 route 172.20.170.224/27 max 29 as 4242420157;
 route 172.20.171.0/26 max 29 as 4242420125;
+route 172.20.171.160/27 max 29 as 4242422103;
 route 172.20.171.80/28 max 29 as 4242421564;
 route 172.20.171.96/27 max 29 as 4242420211;
 route 172.20.172.0/28 max 29 as 4242423160;
@@ -394,6 +397,7 @@ route 172.20.184.160/28 max 29 as 4242421788;
 route 172.20.184.192/28 max 29 as 4242420078;
 route 172.20.184.208/28 max 29 as 4242420078;
 route 172.20.184.224/28 max 29 as 4242420078;
+route 172.20.184.240/29 max 29 as 4242420661;
 route 172.20.184.32/27 max 29 as 4242423884;
 route 172.20.186.0/24 max 29 as 4242421588;
 route 172.20.18.64/27 max 29 as 4242423754;
@@ -462,6 +466,7 @@ route 172.20.224.0/26 max 29 as 4242422284;
 route 172.20.224.64/27 max 29 as 4242421070;
 route 172.20.224.96/27 max 29 as 4242421987;
 route 172.20.227.0/27 max 29 as 4242423965;
+route 172.20.227.112/28 max 29 as 4242423636;
 route 172.20.227.128/27 max 29 as 4242422543;
 route 172.20.227.160/28 max 29 as 4242429990;
 route 172.20.227.192/27 max 29 as 4242420058;
@@ -552,6 +557,7 @@ route 172.20.39.96/27 max 29 as 4242423615;
 route 172.20.40.0/24 max 29 as 4242420124;
 route 172.20.4.0/27 max 29 as 4242421199;
 route 172.20.41.0/27 max 29 as 4242422381;
+route 172.20.4.112/28 max 29 as 4242420194;
 route 172.20.4.128/26 max 29 as 4242420049;
 route 172.20.41.32/28 max 29 as 4242420208;
 route 172.20.41.64/27 max 29 as 4242421019;
@@ -640,6 +646,7 @@ route 172.20.66.64/28 max 29 as 4242420101;
 route 172.20.6.96/29 max 29 as 4242420981;
 route 172.20.72.0/21 max 29 as 4242421127;
 route 172.20.8.0/23 max 29 as 4242423201;
+route 172.21.0.53/32 max 32 as 0;
 route 172.21.100.0/28 max 29 as 4242423737;
 route 172.21.100.128/25 max 29 as 4242423088;
 route 172.21.100.32/27 max 29 as 4242428988;
@@ -681,6 +688,7 @@ route 172.21.64.64/27 max 29 as 4242421116;
 route 172.21.64.96/27 max 29 as 4242422065;
 route 172.21.65.0/27 max 29 as 4242420778;
 route 172.21.65.32/28 max 29 as 4242422379;
+route 172.21.65.48/28 max 29 as 4242421690;
 route 172.21.65.64/29 max 29 as 4242423999;
 route 172.21.66.128/27 max 29 as 4242423886;
 route 172.21.66.64/27 max 29 as 4242423955;
@@ -688,6 +696,7 @@ route 172.21.66.96/27 max 29 as 4242422809;
 route 172.21.67.0/27 max 29 as 4242420167;
 route 172.21.67.128/28 max 29 as 4242423010;
 route 172.21.67.32/27 max 29 as 4242420339;
+route 172.21.67.64/27 max 29 as 4242420807;
 route 172.21.69.0/24 max 29 as 4242423931;
 route 172.21.70.0/23 max 29 as 4242423158;
 route 172.21.74.0/27 max 29 as 4242423454;
@@ -700,6 +709,7 @@ route 172.21.79.0/26 max 29 as 4242421500;
 route 172.21.79.64/28 max 29 as 4242421873;
 route 172.21.79.80/28 max 29 as 4242420186;
 route 172.21.79.96/27 max 29 as 4242422773;
+route 172.21.80.0/26 max 29 as 4242422077;
 route 172.21.84.0/27 max 29 as 4242422381;
 route 172.21.84.32/27 max 29 as 4242420885;
 route 172.21.84.64/27 max 29 as 4242423919;
@@ -725,13 +735,11 @@ route 172.21.99.96/27 max 29 as 4242422232;
 route 172.22.0.43/32 max 32 as 4242420101;
 route 172.22.0.43/32 max 32 as 4242420013;
 route 172.22.0.43/32 max 32 as 4242423723;
-route 172.22.0.53/32 max 32 as 64737;
-route 172.22.0.53/32 max 32 as 4242420123;
-route 172.22.0.53/32 max 32 as 4242420321;
-route 172.22.0.53/32 max 32 as 4242420022;
+route 172.22.0.53/32 max 32 as 0;
 route 172.22.0.94/32 max 32 as 56662;
 route 172.22.0.94/32 max 32 as 4242420077;
 route 172.22.0.94/32 max 32 as 4242420022;
+route 172.22.0.94/32 max 32 as 4242421050;
 route 172.22.100.0/24 max 29 as 64698;
 route 172.22.101.0/27 max 29 as 4242420152;
 route 172.22.101.200/29 max 29 as 4242422027;
@@ -787,6 +795,7 @@ route 172.22.127.0/26 max 29 as 4242420140;
 route 172.22.127.128/25 max 29 as 4242422277;
 route 172.22.127.64/27 max 29 as 4242422227;
 route 172.22.127.96/27 max 29 as 4242420076;
+route 172.22.128.0/27 max 29 as 31867;
 route 172.22.128.128/27 max 29 as 4242420185;
 route 172.22.128.64/28 max 29 as 4242420553;
 route 172.22.129.0/28 max 29 as 4242421702;
@@ -933,12 +942,8 @@ route 172.22.98.0/28 max 29 as 4242420019;
 route 172.22.99.0/24 max 29 as 64699;
 route 172.23.0.20/32 max 32 as 64719;
 route 172.23.0.32/28 max 29 as 4242420321;
-route 172.23.0.53/32 max 32 as 4242420022;
 route 172.23.0.53/32 max 32 as 64737;
-route 172.23.0.53/32 max 32 as 4242420123;
-route 172.23.0.53/32 max 32 as 4242420122;
-route 172.23.0.53/32 max 32 as 76198;
-route 172.23.0.53/32 max 32 as 4242423723;
+route 172.23.0.53/32 max 32 as 4242422601;
 route 172.23.0.80/32 max 32 as 4242420123;
 route 172.23.0.80/32 max 32 as 64737;
 route 172.23.0.80/32 max 32 as 64719;
@@ -1007,6 +1012,7 @@ route 172.23.162.0/27 max 29 as 4242422890;
 route 172.23.163.0/27 max 29 as 4242421200;
 route 172.23.163.128/27 max 29 as 4242421289;
 route 172.23.163.192/26 max 29 as 4242423941;
+route 172.23.163.32/27 max 29 as 4242420251;
 route 172.23.164.0/23 max 29 as 76160;
 route 172.23.168.0/25 max 29 as 4242423924;
 route 172.23.168.128/27 max 29 as 4242421518;
@@ -1066,6 +1072,7 @@ route 172.23.222.64/27 max 29 as 4242422027;
 route 172.23.223.0/27 max 29 as 4242422028;
 route 172.23.223.96/27 max 29 as 4242423794;
 route 172.23.230.0/26 max 29 as 4242423921;
+route 172.23.230.64/26 max 29 as 4242421824;
 route 172.23.231.0/26 max 29 as 4242422037;
 route 172.23.233.0/24 max 29 as 4242422244;
 route 172.23.234.0/28 max 29 as 4242423852;
@@ -1085,6 +1092,7 @@ route 172.23.239.128/25 max 29 as 4242422877;
 route 172.23.240.32/27 max 29 as 4242420525;
 route 172.23.241.0/26 max 29 as 4242420252;
 route 172.23.245.0/24 max 29 as 76175;
+route 172.23.248.160/27 max 29 as 4242420225;
 route 172.23.248.192/28 max 29 as 4242422480;
 route 172.23.248.224/28 max 29 as 4242422481;
 route 172.23.249.0/24 max 29 as 4242421338;
@@ -1113,6 +1121,8 @@ route 172.23.56.0/24 max 29 as 4242420018;
 route 172.23.57.0/28 max 29 as 4242421905;
 route 172.23.60.128/25 max 29 as 4242423158;
 route 172.23.63.0/24 max 29 as 4242423006;
+route 172.23.64.0/25 max 29 as 4242421375;
+route 172.23.64.128/25 max 29 as 4242421374;
 route 172.23.67.0/25 max 29 as 4242420022;
 route 172.23.73.0/26 max 29 as 4242421823;
 route 172.23.76.0/26 max 29 as 4242422305;
diff --git a/nodes/fsn2/bird2/bird/roa_dn42_v6.conf b/nodes/fsn2/bird2/bird/roa_dn42_v6.conf
index 28018ef..ac600d5 100644
--- a/nodes/fsn2/bird2/bird/roa_dn42_v6.conf
+++ b/nodes/fsn2/bird2/bird/roa_dn42_v6.conf
@@ -1,10 +1,10 @@
-# Updated at Fri Mar 27 17:32:16 MST 2020
-#commit 83cf7b7239bbc7a418c5833961d1682164b495b6
-#Merge: 66cb464 51658e9
+# Updated at Thu Apr  9 04:32:16 MST 2020
+#commit 04aa414e4048373bcc3ccd90294ae1fc78812656
+#Merge: 3417f58 d5b9613
 #Author: burble <simon@burble.com>
-#Date:   Fri Mar 27 23:41:25 2020 +0000
+#Date:   Thu Apr 9 07:11:40 2020 +0000
 #
-#    Merge branch 'master' of haha662/registry into master
+#    Merge branch 'master' of syllabear/registry into master
 route fd00:0801:3000::/40 max 64 as 4242420656;
 route fd00:0801:3000::/44 max 64 as 4242420656;
 route fd00:0801:3010::/44 max 64 as 4242420656;
@@ -41,6 +41,7 @@ route fd00:aaaa:256::/48 max 64 as 4242420117;
 route fd00:abcd:e:0100::/56 max 64 as 4242420198;
 route fd00:abcd:e::/48 max 64 as 4242420158;
 route fd00:b709::/48 max 64 as 4242421103;
+route fd00:bad:a55::/48 max 64 as 31867;
 route fd00:bad:b00b::/64 max 64 as 4242420467;
 route fd00:bad:c0de::/48 max 64 as 4242420206;
 route fd00:bad:f00d::/48 max 64 as 4242420899;
@@ -62,6 +63,7 @@ route fd01:470:7d4c::/48 max 64 as 64600;
 route fd01:470:f129::/48 max 64 as 4242422299;
 route fd01:5e19:11e1::/48 max 64 as 4242422506;
 route fd01:67c:2ed8::/48 max 64 as 65038;
+route fd03:4de4:6baa::/48 max 64 as 4242420309;
 route fd03:7e46:2707::/48 max 64 as 4242421928;
 route fd04:52c0:4000::/48 max 64 as 4242423585;
 route fd05:3aca:c3a0:a2c1::/64 max 64 as 0;
@@ -71,6 +73,7 @@ route fd05:a2d1:a767::/48 max 48 as 4242422237;
 route fd06:8187:fb00::/40 max 64 as 65026;
 route fd06:b047:f7de::/48 max 64 as 64872;
 route fd06:e881:1300::/44 max 64 as 4242420842;
+route fd07:0369:6502::/48 max 48 as 4242423468;
 route fd07:0d34:7969::/48 max 48 as 4242423618;
 route fd07:96ae:572e::/48 max 64 as 64901;
 route fd08:a855:d4c7::/48 max 64 as 4242423027;
@@ -274,6 +277,7 @@ route fd42:42:2166::/48 max 64 as 4242423141;
 route fd42:4242:0339::/48 max 64 as 4242420339;
 route fd42:4242:0815::/48 max 64 as 4242420815;
 route fd42:4242:1337::/48 max 64 as 4242420414;
+route fd42:4242:1375::/48 max 64 as 4242421375;
 route fd42:4242:17::/48 max 64 as 4242420017;
 route fd42:4242:1842::/48 max 64 as 4242421842;
 route fd42:4242:1921::/48 max 64 as 4242421921;
@@ -307,6 +311,7 @@ route fd42:4992:6b6f::/48 max 64 as 4242428202;
 route fd42:4992:acbd::/48 max 64 as 4242423504;
 route fd42:4999:6a6d::/48 max 64 as 4242420302;
 route fd42:4dd0:ff00::/48 max 64 as 4242422428;
+route fd42:4f81:ecf4::/48 max 48 as 4242421824;
 route fd42:53fb:543a::/48 max 64 as 4242421408;
 route fd42:5aaf:9fe8::/48 max 64 as 4242420666;
 route fd42:5d71:219::/48 max 48 as 4242420119;
@@ -385,18 +390,16 @@ route fd42:d42:d42:43::/64 max 64 as 4242420013;
 route fd42:d42:d42:43::/64 max 64 as 4242423723;
 route fd42:d42:d42::/48 max 64 as 64737;
 route fd42:d42:d42:53::/64 max 64 as 64737;
-route fd42:d42:d42:53::/64 max 64 as 4242420022;
-route fd42:d42:d42:53::/64 max 64 as 4242423955;
-route fd42:d42:d42:53::/64 max 64 as 4242420123;
-route fd42:d42:d42:53::/64 max 64 as 4242423723;
+route fd42:d42:d42:53::/64 max 64 as 4242422601;
 route fd42:d42:d42:54::/64 max 64 as 4242420119;
-route fd42:d42:d42:54::/64 max 64 as 4242422601;
+route fd42:d42:d42:54::/64 max 64 as 4242423914;
 route fd42:d42:d42:6667::/64 max 64 as 64600;
 route fd42:d42:d42:6667::/64 max 64 as 4242420101;
 route fd42:d42:d42:80::/64 max 64 as 64737;
 route fd42:d42:d42:80::/64 max 64 as 4242420123;
 route fd42:d42:d42:80::/64 max 64 as 64719;
 route fd42:d42:d42:80::/64 max 64 as 4242422601;
+route fd42:d42:d42:9001::/64 max 64 as 4242421050;
 route fd42:d42:d42:9050::/64 max 64 as 4242420022;
 route fd42:d42:d42:9050::/64 max 64 as 4242420077;
 route fd42:d447:775c::/48 max 48 as 4242421070;
@@ -410,6 +413,7 @@ route fd42:dee:dee::/48 max 64 as 4242423424;
 route fd42:df42::/48 max 64 as 64773;
 route fd42:e0f1:5b4b::/48 max 64 as 4242420164;
 route fd42:e9ad:e297::/48 max 64 as 4242421369;
+route fd42:ec20:4ef1::/48 max 64 as 4242421488;
 route fd42:eef1:47b5::/48 max 64 as 4242420239;
 route fd42:f10:411::/48 max 64 as 4242422100;
 route fd42:f10:a15::/48 max 64 as 4242422100;
@@ -498,9 +502,6 @@ route fd62:7eab:c85f::/48 max 64 as 4242422681;
 route fd62:a393:3d91::/48 max 64 as 4242421128;
 route fd62:cc46:576b::/48 max 64 as 4242422809;
 route fd62:cd4d:28a1::/48 max 48 as 4242420173;
-route fd63:1e39:6f73:2929::/64 max 64 as 64654;
-route fd63:1e39:6f73:2929::/64 max 64 as 4242422718;
-route fd63:1e39:6f73:2929::/64 max 64 as 4242422480;
 route fd63:1e39:6f73::/48 max 64 as 64697;
 route fd63:1e39:6f73::/48 max 64 as 64766;
 route fd64:cafe:cafe::/48 max 64 as 4242423400;
@@ -569,9 +570,11 @@ route fd83:e002:c8a1::/48 max 64 as 64525;
 route fd84:688d:22bb::/48 max 64 as 4242423932;
 route fd85:050d:222d::/48 max 48 as 4242423954;
 route fd85:1dea:2093::/48 max 64 as 4242421009;
+route fd85:7370:a8a1::/48 max 48 as 4242421690;
 route fd86:4169:1552::/48 max 48 as 4242420823;
 route fd86:b4dc:4b1e::/48 max 64 as 65037;
 route fd86:bc21:638a::/48 max 64 as 4242420674;
+route fd88:1926:817::/48 max 64 as 4242420251;
 route fd88:2e46:4b1c:5988::/64 max 64 as 4242420017;
 route fd88:4903:4b9f:d66f::/64 max 64 as 4242420017;
 route fd88:8888:abcd::/48 max 64 as 4242420448;
@@ -610,12 +613,14 @@ route fd9a:d414:cf1c::/48 max 64 as 4242420248;
 route fd9a:f34d:4541::/48 max 64 as 4242422200;
 route fd9b:8277:c31a::/48 max 64 as 4242423320;
 route fd9b:d633:d173::/48 max 64 as 4242422037;
+route fd9c:bee3:3694::/48 max 64 as 4242420225;
 route fd9c:cab6:54f3::/48 max 64 as 4242421775;
 route fd9d:5e08:b9f9::/48 max 64 as 4242421096;
 route fd9d:5e08:b9f9:c3::/64 max 64 as 64654;
 route fd9d:5e08:b9f9:c3::/64 max 64 as 4242422718;
 route fd9d:5e08:b9f9:c3::/64 max 64 as 4242422480;
 route fd9e:2c7c:fea6::/47 max 64 as 4242422228;
+route fd9e:b565:def3::/48 max 48 as 4242423565;
 route fd9e:e609:dde2::/48 max 48 as 4242422251;
 route fd9f:1630:5351::/48 max 64 as 4242423557;
 route fda0:23:1f05:1::/64 max 64 as 4242423514;
@@ -652,6 +657,7 @@ route fda5:ac02:e120::/48 max 48 as 4242422369;
 route fda5:f049:ddcc::/48 max 48 as 4242420196;
 route fda6:2474:15a4::/48 max 48 as 4242423078;
 route fda6:9506:01d5::/48 max 64 as 4242422541;
+route fda6:9506:01d5::/48 max 64 as 4242422545;
 route fda7:a975:bfc2::/48 max 64 as 4242420469;
 route fda7:c947:6d13::/48 max 64 as 4242420415;
 route fda7:e8fa:a57f::/48 max 64 as 4242423211;
@@ -670,6 +676,7 @@ route fdac:f3f:e7e2::/48 max 64 as 4242422333;
 route fdac:f820:373a::/48 max 64 as 4242422128;
 route fdad:850e:9f6a:9cb3::/64 max 64 as 4242420190;
 route fdae:e2d8:34a1::/48 max 64 as 4242420756;
+route fdae:e3cd:11d9::/48 max 48 as 4242420807;
 route fdb1:e72a:343d::/48 max 64 as 4242420207;
 route fdb2:520f:f4a7::/48 max 64 as 4242423774;
 route fdb2:a999:7f8c::/48 max 48 as 4242422389;
@@ -709,6 +716,7 @@ route fdc0:bc88:be::/48 max 64 as 4242421811;
 route fdc0:f16e:7051::/48 max 64 as 4242423567;
 route fdc1:31f:b14f::/48 max 64 as 64720;
 route fdc1:d4b:b89a::/48 max 64 as 4242423556;
+route fdc2:752c:29d1::/48 max 48 as 4242423636;
 route fdc3:10cd:ae9b::/48 max 64 as 4242420789;
 route fdc3:10cd:ae9c::/48 max 64 as 4242420789;
 route fdc3:10cd:ae9d::/48 max 64 as 4242420789;
@@ -758,6 +766,8 @@ route fdcf:3c00:e001::/48 max 64 as 4242422287;
 route fdcf:7494:4f2c::/48 max 64 as 4242420813;
 route fdcf:8538:9ad5::/48 max 64 as 4242423914;
 route fdcf:de54:13ef::/48 max 64 as 4242421508;
+route fdd0:17ea:3a52::/48 max 64 as 4242420194;
+route fdd0:77f2:44de::/48 max 48 as 4242422077;
 route fdd0:c468:8eb1::/48 max 64 as 4242423843;
 route fdd1:1c64:66fd::/48 max 64 as 4242421233;
 route fdd1:1c64:66fd::/58 max 64 as 4242421233;
@@ -803,6 +813,7 @@ route fde3:a7e3:7957::/48 max 64 as 4242423004;
 route fde4:2355:54fe::/48 max 48 as 4242420185;
 route fde6:36fc:c985::/64 max 64 as 65527;
 route fde6:402d:990d::/48 max 64 as 4242420576;
+route fde6:dee3:615d::/48 max 48 as 4242422103;
 route fde7:32ae:ee77::/48 max 64 as 4242422777;
 route fde7:56e7:ead3::/48 max 64 as 4242420246;
 route fde7:76fd:7444::/48 max 64 as 4242420157;
diff --git a/nodes/hel1/bird2/bird/roa_dn42.conf b/nodes/hel1/bird2/bird/roa_dn42.conf
index 05583b5..5405ac7 100644
--- a/nodes/hel1/bird2/bird/roa_dn42.conf
+++ b/nodes/hel1/bird2/bird/roa_dn42.conf
@@ -1,10 +1,10 @@
-# Updated at Fri Mar 27 17:32:16 MST 2020
-#commit 83cf7b7239bbc7a418c5833961d1682164b495b6
-#Merge: 66cb464 51658e9
+# Updated at Thu Apr  9 04:32:16 MST 2020
+#commit 04aa414e4048373bcc3ccd90294ae1fc78812656
+#Merge: 3417f58 d5b9613
 #Author: burble <simon@burble.com>
-#Date:   Fri Mar 27 23:41:25 2020 +0000
+#Date:   Thu Apr 9 07:11:40 2020 +0000
 #
-#    Merge branch 'master' of haha662/registry into master
+#    Merge branch 'master' of syllabear/registry into master
 route 10.0.0.0/16 max 29 as 65079;
 route 10.100.0.0/14 max 29 as 64654;
 route 10.100.0.0/14 max 29 as 4242422718;
@@ -186,7 +186,7 @@ route 10.90.0.0/16 max 29 as 65190;
 route 10.99.0.0/16 max 29 as 65099;
 route 172.20.0.35/32 max 32 as 4242420656;
 route 172.20.0.53/32 max 32 as 4242420119;
-route 172.20.0.53/32 max 32 as 4242422601;
+route 172.20.0.53/32 max 32 as 4242423914;
 route 172.20.10.0/26 max 29 as 4242421406;
 route 172.20.10.128/29 max 29 as 4242423369;
 route 172.20.1.0/24 max 24 as 4242420119;
@@ -298,6 +298,8 @@ route 172.20.158.0/27 max 29 as 206633;
 route 172.20.158.128/26 max 29 as 4242421331;
 route 172.20.158.32/27 max 29 as 4242421629;
 route 172.20.158.64/27 max 29 as 4242422541;
+route 172.20.158.64/27 max 29 as 4242422545;
+route 172.20.158.96/27 max 29 as 4242423468;
 route 172.20.159.0/29 max 29 as 4242422878;
 route 172.20.159.160/27 max 29 as 4242421709;
 route 172.20.159.16/28 max 29 as 4242421055;
@@ -342,6 +344,7 @@ route 172.20.170.160/28 max 29 as 4242422161;
 route 172.20.170.192/27 max 29 as 4242423934;
 route 172.20.170.224/27 max 29 as 4242420157;
 route 172.20.171.0/26 max 29 as 4242420125;
+route 172.20.171.160/27 max 29 as 4242422103;
 route 172.20.171.80/28 max 29 as 4242421564;
 route 172.20.171.96/27 max 29 as 4242420211;
 route 172.20.172.0/28 max 29 as 4242423160;
@@ -394,6 +397,7 @@ route 172.20.184.160/28 max 29 as 4242421788;
 route 172.20.184.192/28 max 29 as 4242420078;
 route 172.20.184.208/28 max 29 as 4242420078;
 route 172.20.184.224/28 max 29 as 4242420078;
+route 172.20.184.240/29 max 29 as 4242420661;
 route 172.20.184.32/27 max 29 as 4242423884;
 route 172.20.186.0/24 max 29 as 4242421588;
 route 172.20.18.64/27 max 29 as 4242423754;
@@ -462,6 +466,7 @@ route 172.20.224.0/26 max 29 as 4242422284;
 route 172.20.224.64/27 max 29 as 4242421070;
 route 172.20.224.96/27 max 29 as 4242421987;
 route 172.20.227.0/27 max 29 as 4242423965;
+route 172.20.227.112/28 max 29 as 4242423636;
 route 172.20.227.128/27 max 29 as 4242422543;
 route 172.20.227.160/28 max 29 as 4242429990;
 route 172.20.227.192/27 max 29 as 4242420058;
@@ -552,6 +557,7 @@ route 172.20.39.96/27 max 29 as 4242423615;
 route 172.20.40.0/24 max 29 as 4242420124;
 route 172.20.4.0/27 max 29 as 4242421199;
 route 172.20.41.0/27 max 29 as 4242422381;
+route 172.20.4.112/28 max 29 as 4242420194;
 route 172.20.4.128/26 max 29 as 4242420049;
 route 172.20.41.32/28 max 29 as 4242420208;
 route 172.20.41.64/27 max 29 as 4242421019;
@@ -640,6 +646,7 @@ route 172.20.66.64/28 max 29 as 4242420101;
 route 172.20.6.96/29 max 29 as 4242420981;
 route 172.20.72.0/21 max 29 as 4242421127;
 route 172.20.8.0/23 max 29 as 4242423201;
+route 172.21.0.53/32 max 32 as 0;
 route 172.21.100.0/28 max 29 as 4242423737;
 route 172.21.100.128/25 max 29 as 4242423088;
 route 172.21.100.32/27 max 29 as 4242428988;
@@ -681,6 +688,7 @@ route 172.21.64.64/27 max 29 as 4242421116;
 route 172.21.64.96/27 max 29 as 4242422065;
 route 172.21.65.0/27 max 29 as 4242420778;
 route 172.21.65.32/28 max 29 as 4242422379;
+route 172.21.65.48/28 max 29 as 4242421690;
 route 172.21.65.64/29 max 29 as 4242423999;
 route 172.21.66.128/27 max 29 as 4242423886;
 route 172.21.66.64/27 max 29 as 4242423955;
@@ -688,6 +696,7 @@ route 172.21.66.96/27 max 29 as 4242422809;
 route 172.21.67.0/27 max 29 as 4242420167;
 route 172.21.67.128/28 max 29 as 4242423010;
 route 172.21.67.32/27 max 29 as 4242420339;
+route 172.21.67.64/27 max 29 as 4242420807;
 route 172.21.69.0/24 max 29 as 4242423931;
 route 172.21.70.0/23 max 29 as 4242423158;
 route 172.21.74.0/27 max 29 as 4242423454;
@@ -700,6 +709,7 @@ route 172.21.79.0/26 max 29 as 4242421500;
 route 172.21.79.64/28 max 29 as 4242421873;
 route 172.21.79.80/28 max 29 as 4242420186;
 route 172.21.79.96/27 max 29 as 4242422773;
+route 172.21.80.0/26 max 29 as 4242422077;
 route 172.21.84.0/27 max 29 as 4242422381;
 route 172.21.84.32/27 max 29 as 4242420885;
 route 172.21.84.64/27 max 29 as 4242423919;
@@ -725,13 +735,11 @@ route 172.21.99.96/27 max 29 as 4242422232;
 route 172.22.0.43/32 max 32 as 4242420101;
 route 172.22.0.43/32 max 32 as 4242420013;
 route 172.22.0.43/32 max 32 as 4242423723;
-route 172.22.0.53/32 max 32 as 64737;
-route 172.22.0.53/32 max 32 as 4242420123;
-route 172.22.0.53/32 max 32 as 4242420321;
-route 172.22.0.53/32 max 32 as 4242420022;
+route 172.22.0.53/32 max 32 as 0;
 route 172.22.0.94/32 max 32 as 56662;
 route 172.22.0.94/32 max 32 as 4242420077;
 route 172.22.0.94/32 max 32 as 4242420022;
+route 172.22.0.94/32 max 32 as 4242421050;
 route 172.22.100.0/24 max 29 as 64698;
 route 172.22.101.0/27 max 29 as 4242420152;
 route 172.22.101.200/29 max 29 as 4242422027;
@@ -787,6 +795,7 @@ route 172.22.127.0/26 max 29 as 4242420140;
 route 172.22.127.128/25 max 29 as 4242422277;
 route 172.22.127.64/27 max 29 as 4242422227;
 route 172.22.127.96/27 max 29 as 4242420076;
+route 172.22.128.0/27 max 29 as 31867;
 route 172.22.128.128/27 max 29 as 4242420185;
 route 172.22.128.64/28 max 29 as 4242420553;
 route 172.22.129.0/28 max 29 as 4242421702;
@@ -933,12 +942,8 @@ route 172.22.98.0/28 max 29 as 4242420019;
 route 172.22.99.0/24 max 29 as 64699;
 route 172.23.0.20/32 max 32 as 64719;
 route 172.23.0.32/28 max 29 as 4242420321;
-route 172.23.0.53/32 max 32 as 4242420022;
 route 172.23.0.53/32 max 32 as 64737;
-route 172.23.0.53/32 max 32 as 4242420123;
-route 172.23.0.53/32 max 32 as 4242420122;
-route 172.23.0.53/32 max 32 as 76198;
-route 172.23.0.53/32 max 32 as 4242423723;
+route 172.23.0.53/32 max 32 as 4242422601;
 route 172.23.0.80/32 max 32 as 4242420123;
 route 172.23.0.80/32 max 32 as 64737;
 route 172.23.0.80/32 max 32 as 64719;
@@ -1007,6 +1012,7 @@ route 172.23.162.0/27 max 29 as 4242422890;
 route 172.23.163.0/27 max 29 as 4242421200;
 route 172.23.163.128/27 max 29 as 4242421289;
 route 172.23.163.192/26 max 29 as 4242423941;
+route 172.23.163.32/27 max 29 as 4242420251;
 route 172.23.164.0/23 max 29 as 76160;
 route 172.23.168.0/25 max 29 as 4242423924;
 route 172.23.168.128/27 max 29 as 4242421518;
@@ -1066,6 +1072,7 @@ route 172.23.222.64/27 max 29 as 4242422027;
 route 172.23.223.0/27 max 29 as 4242422028;
 route 172.23.223.96/27 max 29 as 4242423794;
 route 172.23.230.0/26 max 29 as 4242423921;
+route 172.23.230.64/26 max 29 as 4242421824;
 route 172.23.231.0/26 max 29 as 4242422037;
 route 172.23.233.0/24 max 29 as 4242422244;
 route 172.23.234.0/28 max 29 as 4242423852;
@@ -1085,6 +1092,7 @@ route 172.23.239.128/25 max 29 as 4242422877;
 route 172.23.240.32/27 max 29 as 4242420525;
 route 172.23.241.0/26 max 29 as 4242420252;
 route 172.23.245.0/24 max 29 as 76175;
+route 172.23.248.160/27 max 29 as 4242420225;
 route 172.23.248.192/28 max 29 as 4242422480;
 route 172.23.248.224/28 max 29 as 4242422481;
 route 172.23.249.0/24 max 29 as 4242421338;
@@ -1113,6 +1121,8 @@ route 172.23.56.0/24 max 29 as 4242420018;
 route 172.23.57.0/28 max 29 as 4242421905;
 route 172.23.60.128/25 max 29 as 4242423158;
 route 172.23.63.0/24 max 29 as 4242423006;
+route 172.23.64.0/25 max 29 as 4242421375;
+route 172.23.64.128/25 max 29 as 4242421374;
 route 172.23.67.0/25 max 29 as 4242420022;
 route 172.23.73.0/26 max 29 as 4242421823;
 route 172.23.76.0/26 max 29 as 4242422305;
diff --git a/nodes/hel1/bird2/bird/roa_dn42_v6.conf b/nodes/hel1/bird2/bird/roa_dn42_v6.conf
index 28018ef..ac600d5 100644
--- a/nodes/hel1/bird2/bird/roa_dn42_v6.conf
+++ b/nodes/hel1/bird2/bird/roa_dn42_v6.conf
@@ -1,10 +1,10 @@
-# Updated at Fri Mar 27 17:32:16 MST 2020
-#commit 83cf7b7239bbc7a418c5833961d1682164b495b6
-#Merge: 66cb464 51658e9
+# Updated at Thu Apr  9 04:32:16 MST 2020
+#commit 04aa414e4048373bcc3ccd90294ae1fc78812656
+#Merge: 3417f58 d5b9613
 #Author: burble <simon@burble.com>
-#Date:   Fri Mar 27 23:41:25 2020 +0000
+#Date:   Thu Apr 9 07:11:40 2020 +0000
 #
-#    Merge branch 'master' of haha662/registry into master
+#    Merge branch 'master' of syllabear/registry into master
 route fd00:0801:3000::/40 max 64 as 4242420656;
 route fd00:0801:3000::/44 max 64 as 4242420656;
 route fd00:0801:3010::/44 max 64 as 4242420656;
@@ -41,6 +41,7 @@ route fd00:aaaa:256::/48 max 64 as 4242420117;
 route fd00:abcd:e:0100::/56 max 64 as 4242420198;
 route fd00:abcd:e::/48 max 64 as 4242420158;
 route fd00:b709::/48 max 64 as 4242421103;
+route fd00:bad:a55::/48 max 64 as 31867;
 route fd00:bad:b00b::/64 max 64 as 4242420467;
 route fd00:bad:c0de::/48 max 64 as 4242420206;
 route fd00:bad:f00d::/48 max 64 as 4242420899;
@@ -62,6 +63,7 @@ route fd01:470:7d4c::/48 max 64 as 64600;
 route fd01:470:f129::/48 max 64 as 4242422299;
 route fd01:5e19:11e1::/48 max 64 as 4242422506;
 route fd01:67c:2ed8::/48 max 64 as 65038;
+route fd03:4de4:6baa::/48 max 64 as 4242420309;
 route fd03:7e46:2707::/48 max 64 as 4242421928;
 route fd04:52c0:4000::/48 max 64 as 4242423585;
 route fd05:3aca:c3a0:a2c1::/64 max 64 as 0;
@@ -71,6 +73,7 @@ route fd05:a2d1:a767::/48 max 48 as 4242422237;
 route fd06:8187:fb00::/40 max 64 as 65026;
 route fd06:b047:f7de::/48 max 64 as 64872;
 route fd06:e881:1300::/44 max 64 as 4242420842;
+route fd07:0369:6502::/48 max 48 as 4242423468;
 route fd07:0d34:7969::/48 max 48 as 4242423618;
 route fd07:96ae:572e::/48 max 64 as 64901;
 route fd08:a855:d4c7::/48 max 64 as 4242423027;
@@ -274,6 +277,7 @@ route fd42:42:2166::/48 max 64 as 4242423141;
 route fd42:4242:0339::/48 max 64 as 4242420339;
 route fd42:4242:0815::/48 max 64 as 4242420815;
 route fd42:4242:1337::/48 max 64 as 4242420414;
+route fd42:4242:1375::/48 max 64 as 4242421375;
 route fd42:4242:17::/48 max 64 as 4242420017;
 route fd42:4242:1842::/48 max 64 as 4242421842;
 route fd42:4242:1921::/48 max 64 as 4242421921;
@@ -307,6 +311,7 @@ route fd42:4992:6b6f::/48 max 64 as 4242428202;
 route fd42:4992:acbd::/48 max 64 as 4242423504;
 route fd42:4999:6a6d::/48 max 64 as 4242420302;
 route fd42:4dd0:ff00::/48 max 64 as 4242422428;
+route fd42:4f81:ecf4::/48 max 48 as 4242421824;
 route fd42:53fb:543a::/48 max 64 as 4242421408;
 route fd42:5aaf:9fe8::/48 max 64 as 4242420666;
 route fd42:5d71:219::/48 max 48 as 4242420119;
@@ -385,18 +390,16 @@ route fd42:d42:d42:43::/64 max 64 as 4242420013;
 route fd42:d42:d42:43::/64 max 64 as 4242423723;
 route fd42:d42:d42::/48 max 64 as 64737;
 route fd42:d42:d42:53::/64 max 64 as 64737;
-route fd42:d42:d42:53::/64 max 64 as 4242420022;
-route fd42:d42:d42:53::/64 max 64 as 4242423955;
-route fd42:d42:d42:53::/64 max 64 as 4242420123;
-route fd42:d42:d42:53::/64 max 64 as 4242423723;
+route fd42:d42:d42:53::/64 max 64 as 4242422601;
 route fd42:d42:d42:54::/64 max 64 as 4242420119;
-route fd42:d42:d42:54::/64 max 64 as 4242422601;
+route fd42:d42:d42:54::/64 max 64 as 4242423914;
 route fd42:d42:d42:6667::/64 max 64 as 64600;
 route fd42:d42:d42:6667::/64 max 64 as 4242420101;
 route fd42:d42:d42:80::/64 max 64 as 64737;
 route fd42:d42:d42:80::/64 max 64 as 4242420123;
 route fd42:d42:d42:80::/64 max 64 as 64719;
 route fd42:d42:d42:80::/64 max 64 as 4242422601;
+route fd42:d42:d42:9001::/64 max 64 as 4242421050;
 route fd42:d42:d42:9050::/64 max 64 as 4242420022;
 route fd42:d42:d42:9050::/64 max 64 as 4242420077;
 route fd42:d447:775c::/48 max 48 as 4242421070;
@@ -410,6 +413,7 @@ route fd42:dee:dee::/48 max 64 as 4242423424;
 route fd42:df42::/48 max 64 as 64773;
 route fd42:e0f1:5b4b::/48 max 64 as 4242420164;
 route fd42:e9ad:e297::/48 max 64 as 4242421369;
+route fd42:ec20:4ef1::/48 max 64 as 4242421488;
 route fd42:eef1:47b5::/48 max 64 as 4242420239;
 route fd42:f10:411::/48 max 64 as 4242422100;
 route fd42:f10:a15::/48 max 64 as 4242422100;
@@ -498,9 +502,6 @@ route fd62:7eab:c85f::/48 max 64 as 4242422681;
 route fd62:a393:3d91::/48 max 64 as 4242421128;
 route fd62:cc46:576b::/48 max 64 as 4242422809;
 route fd62:cd4d:28a1::/48 max 48 as 4242420173;
-route fd63:1e39:6f73:2929::/64 max 64 as 64654;
-route fd63:1e39:6f73:2929::/64 max 64 as 4242422718;
-route fd63:1e39:6f73:2929::/64 max 64 as 4242422480;
 route fd63:1e39:6f73::/48 max 64 as 64697;
 route fd63:1e39:6f73::/48 max 64 as 64766;
 route fd64:cafe:cafe::/48 max 64 as 4242423400;
@@ -569,9 +570,11 @@ route fd83:e002:c8a1::/48 max 64 as 64525;
 route fd84:688d:22bb::/48 max 64 as 4242423932;
 route fd85:050d:222d::/48 max 48 as 4242423954;
 route fd85:1dea:2093::/48 max 64 as 4242421009;
+route fd85:7370:a8a1::/48 max 48 as 4242421690;
 route fd86:4169:1552::/48 max 48 as 4242420823;
 route fd86:b4dc:4b1e::/48 max 64 as 65037;
 route fd86:bc21:638a::/48 max 64 as 4242420674;
+route fd88:1926:817::/48 max 64 as 4242420251;
 route fd88:2e46:4b1c:5988::/64 max 64 as 4242420017;
 route fd88:4903:4b9f:d66f::/64 max 64 as 4242420017;
 route fd88:8888:abcd::/48 max 64 as 4242420448;
@@ -610,12 +613,14 @@ route fd9a:d414:cf1c::/48 max 64 as 4242420248;
 route fd9a:f34d:4541::/48 max 64 as 4242422200;
 route fd9b:8277:c31a::/48 max 64 as 4242423320;
 route fd9b:d633:d173::/48 max 64 as 4242422037;
+route fd9c:bee3:3694::/48 max 64 as 4242420225;
 route fd9c:cab6:54f3::/48 max 64 as 4242421775;
 route fd9d:5e08:b9f9::/48 max 64 as 4242421096;
 route fd9d:5e08:b9f9:c3::/64 max 64 as 64654;
 route fd9d:5e08:b9f9:c3::/64 max 64 as 4242422718;
 route fd9d:5e08:b9f9:c3::/64 max 64 as 4242422480;
 route fd9e:2c7c:fea6::/47 max 64 as 4242422228;
+route fd9e:b565:def3::/48 max 48 as 4242423565;
 route fd9e:e609:dde2::/48 max 48 as 4242422251;
 route fd9f:1630:5351::/48 max 64 as 4242423557;
 route fda0:23:1f05:1::/64 max 64 as 4242423514;
@@ -652,6 +657,7 @@ route fda5:ac02:e120::/48 max 48 as 4242422369;
 route fda5:f049:ddcc::/48 max 48 as 4242420196;
 route fda6:2474:15a4::/48 max 48 as 4242423078;
 route fda6:9506:01d5::/48 max 64 as 4242422541;
+route fda6:9506:01d5::/48 max 64 as 4242422545;
 route fda7:a975:bfc2::/48 max 64 as 4242420469;
 route fda7:c947:6d13::/48 max 64 as 4242420415;
 route fda7:e8fa:a57f::/48 max 64 as 4242423211;
@@ -670,6 +676,7 @@ route fdac:f3f:e7e2::/48 max 64 as 4242422333;
 route fdac:f820:373a::/48 max 64 as 4242422128;
 route fdad:850e:9f6a:9cb3::/64 max 64 as 4242420190;
 route fdae:e2d8:34a1::/48 max 64 as 4242420756;
+route fdae:e3cd:11d9::/48 max 48 as 4242420807;
 route fdb1:e72a:343d::/48 max 64 as 4242420207;
 route fdb2:520f:f4a7::/48 max 64 as 4242423774;
 route fdb2:a999:7f8c::/48 max 48 as 4242422389;
@@ -709,6 +716,7 @@ route fdc0:bc88:be::/48 max 64 as 4242421811;
 route fdc0:f16e:7051::/48 max 64 as 4242423567;
 route fdc1:31f:b14f::/48 max 64 as 64720;
 route fdc1:d4b:b89a::/48 max 64 as 4242423556;
+route fdc2:752c:29d1::/48 max 48 as 4242423636;
 route fdc3:10cd:ae9b::/48 max 64 as 4242420789;
 route fdc3:10cd:ae9c::/48 max 64 as 4242420789;
 route fdc3:10cd:ae9d::/48 max 64 as 4242420789;
@@ -758,6 +766,8 @@ route fdcf:3c00:e001::/48 max 64 as 4242422287;
 route fdcf:7494:4f2c::/48 max 64 as 4242420813;
 route fdcf:8538:9ad5::/48 max 64 as 4242423914;
 route fdcf:de54:13ef::/48 max 64 as 4242421508;
+route fdd0:17ea:3a52::/48 max 64 as 4242420194;
+route fdd0:77f2:44de::/48 max 48 as 4242422077;
 route fdd0:c468:8eb1::/48 max 64 as 4242423843;
 route fdd1:1c64:66fd::/48 max 64 as 4242421233;
 route fdd1:1c64:66fd::/58 max 64 as 4242421233;
@@ -803,6 +813,7 @@ route fde3:a7e3:7957::/48 max 64 as 4242423004;
 route fde4:2355:54fe::/48 max 48 as 4242420185;
 route fde6:36fc:c985::/64 max 64 as 65527;
 route fde6:402d:990d::/48 max 64 as 4242420576;
+route fde6:dee3:615d::/48 max 48 as 4242422103;
 route fde7:32ae:ee77::/48 max 64 as 4242422777;
 route fde7:56e7:ead3::/48 max 64 as 4242420246;
 route fde7:76fd:7444::/48 max 64 as 4242420157;
diff --git a/nodes/nbg1/bird2/bird/roa_dn42.conf b/nodes/nbg1/bird2/bird/roa_dn42.conf
index 6c07b18..5405ac7 100644
--- a/nodes/nbg1/bird2/bird/roa_dn42.conf
+++ b/nodes/nbg1/bird2/bird/roa_dn42.conf
@@ -1,9 +1,10 @@
-# Updated at Wed Apr  1 15:32:15 MST 2020
-#commit 96b8dcd2d3aac7d5fc005d9ed22fe6d100df4029
-#Author: Jon Lundy <xuu@sour.is>
-#Date:   Wed Apr 1 11:07:18 2020 -0600
+# Updated at Thu Apr  9 04:32:16 MST 2020
+#commit 04aa414e4048373bcc3ccd90294ae1fc78812656
+#Merge: 3417f58 d5b9613
+#Author: burble <simon@burble.com>
+#Date:   Thu Apr 9 07:11:40 2020 +0000
 #
-#    add burble
+#    Merge branch 'master' of syllabear/registry into master
 route 10.0.0.0/16 max 29 as 65079;
 route 10.100.0.0/14 max 29 as 64654;
 route 10.100.0.0/14 max 29 as 4242422718;
@@ -185,7 +186,6 @@ route 10.90.0.0/16 max 29 as 65190;
 route 10.99.0.0/16 max 29 as 65099;
 route 172.20.0.35/32 max 32 as 4242420656;
 route 172.20.0.53/32 max 32 as 4242420119;
-route 172.20.0.53/32 max 32 as 4242422601;
 route 172.20.0.53/32 max 32 as 4242423914;
 route 172.20.10.0/26 max 29 as 4242421406;
 route 172.20.10.128/29 max 29 as 4242423369;
@@ -344,6 +344,7 @@ route 172.20.170.160/28 max 29 as 4242422161;
 route 172.20.170.192/27 max 29 as 4242423934;
 route 172.20.170.224/27 max 29 as 4242420157;
 route 172.20.171.0/26 max 29 as 4242420125;
+route 172.20.171.160/27 max 29 as 4242422103;
 route 172.20.171.80/28 max 29 as 4242421564;
 route 172.20.171.96/27 max 29 as 4242420211;
 route 172.20.172.0/28 max 29 as 4242423160;
@@ -465,6 +466,7 @@ route 172.20.224.0/26 max 29 as 4242422284;
 route 172.20.224.64/27 max 29 as 4242421070;
 route 172.20.224.96/27 max 29 as 4242421987;
 route 172.20.227.0/27 max 29 as 4242423965;
+route 172.20.227.112/28 max 29 as 4242423636;
 route 172.20.227.128/27 max 29 as 4242422543;
 route 172.20.227.160/28 max 29 as 4242429990;
 route 172.20.227.192/27 max 29 as 4242420058;
@@ -555,6 +557,7 @@ route 172.20.39.96/27 max 29 as 4242423615;
 route 172.20.40.0/24 max 29 as 4242420124;
 route 172.20.4.0/27 max 29 as 4242421199;
 route 172.20.41.0/27 max 29 as 4242422381;
+route 172.20.4.112/28 max 29 as 4242420194;
 route 172.20.4.128/26 max 29 as 4242420049;
 route 172.20.41.32/28 max 29 as 4242420208;
 route 172.20.41.64/27 max 29 as 4242421019;
@@ -643,6 +646,7 @@ route 172.20.66.64/28 max 29 as 4242420101;
 route 172.20.6.96/29 max 29 as 4242420981;
 route 172.20.72.0/21 max 29 as 4242421127;
 route 172.20.8.0/23 max 29 as 4242423201;
+route 172.21.0.53/32 max 32 as 0;
 route 172.21.100.0/28 max 29 as 4242423737;
 route 172.21.100.128/25 max 29 as 4242423088;
 route 172.21.100.32/27 max 29 as 4242428988;
@@ -684,6 +688,7 @@ route 172.21.64.64/27 max 29 as 4242421116;
 route 172.21.64.96/27 max 29 as 4242422065;
 route 172.21.65.0/27 max 29 as 4242420778;
 route 172.21.65.32/28 max 29 as 4242422379;
+route 172.21.65.48/28 max 29 as 4242421690;
 route 172.21.65.64/29 max 29 as 4242423999;
 route 172.21.66.128/27 max 29 as 4242423886;
 route 172.21.66.64/27 max 29 as 4242423955;
@@ -691,6 +696,7 @@ route 172.21.66.96/27 max 29 as 4242422809;
 route 172.21.67.0/27 max 29 as 4242420167;
 route 172.21.67.128/28 max 29 as 4242423010;
 route 172.21.67.32/27 max 29 as 4242420339;
+route 172.21.67.64/27 max 29 as 4242420807;
 route 172.21.69.0/24 max 29 as 4242423931;
 route 172.21.70.0/23 max 29 as 4242423158;
 route 172.21.74.0/27 max 29 as 4242423454;
@@ -703,6 +709,7 @@ route 172.21.79.0/26 max 29 as 4242421500;
 route 172.21.79.64/28 max 29 as 4242421873;
 route 172.21.79.80/28 max 29 as 4242420186;
 route 172.21.79.96/27 max 29 as 4242422773;
+route 172.21.80.0/26 max 29 as 4242422077;
 route 172.21.84.0/27 max 29 as 4242422381;
 route 172.21.84.32/27 max 29 as 4242420885;
 route 172.21.84.64/27 max 29 as 4242423919;
@@ -728,13 +735,11 @@ route 172.21.99.96/27 max 29 as 4242422232;
 route 172.22.0.43/32 max 32 as 4242420101;
 route 172.22.0.43/32 max 32 as 4242420013;
 route 172.22.0.43/32 max 32 as 4242423723;
-route 172.22.0.53/32 max 32 as 64737;
-route 172.22.0.53/32 max 32 as 4242420123;
-route 172.22.0.53/32 max 32 as 4242420321;
-route 172.22.0.53/32 max 32 as 4242420022;
+route 172.22.0.53/32 max 32 as 0;
 route 172.22.0.94/32 max 32 as 56662;
 route 172.22.0.94/32 max 32 as 4242420077;
 route 172.22.0.94/32 max 32 as 4242420022;
+route 172.22.0.94/32 max 32 as 4242421050;
 route 172.22.100.0/24 max 29 as 64698;
 route 172.22.101.0/27 max 29 as 4242420152;
 route 172.22.101.200/29 max 29 as 4242422027;
@@ -937,12 +942,7 @@ route 172.22.98.0/28 max 29 as 4242420019;
 route 172.22.99.0/24 max 29 as 64699;
 route 172.23.0.20/32 max 32 as 64719;
 route 172.23.0.32/28 max 29 as 4242420321;
-route 172.23.0.53/32 max 32 as 4242420022;
 route 172.23.0.53/32 max 32 as 64737;
-route 172.23.0.53/32 max 32 as 4242420123;
-route 172.23.0.53/32 max 32 as 4242420122;
-route 172.23.0.53/32 max 32 as 76198;
-route 172.23.0.53/32 max 32 as 4242423723;
 route 172.23.0.53/32 max 32 as 4242422601;
 route 172.23.0.80/32 max 32 as 4242420123;
 route 172.23.0.80/32 max 32 as 64737;
@@ -1012,6 +1012,7 @@ route 172.23.162.0/27 max 29 as 4242422890;
 route 172.23.163.0/27 max 29 as 4242421200;
 route 172.23.163.128/27 max 29 as 4242421289;
 route 172.23.163.192/26 max 29 as 4242423941;
+route 172.23.163.32/27 max 29 as 4242420251;
 route 172.23.164.0/23 max 29 as 76160;
 route 172.23.168.0/25 max 29 as 4242423924;
 route 172.23.168.128/27 max 29 as 4242421518;
@@ -1120,6 +1121,8 @@ route 172.23.56.0/24 max 29 as 4242420018;
 route 172.23.57.0/28 max 29 as 4242421905;
 route 172.23.60.128/25 max 29 as 4242423158;
 route 172.23.63.0/24 max 29 as 4242423006;
+route 172.23.64.0/25 max 29 as 4242421375;
+route 172.23.64.128/25 max 29 as 4242421374;
 route 172.23.67.0/25 max 29 as 4242420022;
 route 172.23.73.0/26 max 29 as 4242421823;
 route 172.23.76.0/26 max 29 as 4242422305;
diff --git a/nodes/nbg1/bird2/bird/roa_dn42_v6.conf b/nodes/nbg1/bird2/bird/roa_dn42_v6.conf
index bd5da44..ac600d5 100644
--- a/nodes/nbg1/bird2/bird/roa_dn42_v6.conf
+++ b/nodes/nbg1/bird2/bird/roa_dn42_v6.conf
@@ -1,9 +1,10 @@
-# Updated at Wed Apr  1 15:32:15 MST 2020
-#commit 96b8dcd2d3aac7d5fc005d9ed22fe6d100df4029
-#Author: Jon Lundy <xuu@sour.is>
-#Date:   Wed Apr 1 11:07:18 2020 -0600
+# Updated at Thu Apr  9 04:32:16 MST 2020
+#commit 04aa414e4048373bcc3ccd90294ae1fc78812656
+#Merge: 3417f58 d5b9613
+#Author: burble <simon@burble.com>
+#Date:   Thu Apr 9 07:11:40 2020 +0000
 #
-#    add burble
+#    Merge branch 'master' of syllabear/registry into master
 route fd00:0801:3000::/40 max 64 as 4242420656;
 route fd00:0801:3000::/44 max 64 as 4242420656;
 route fd00:0801:3010::/44 max 64 as 4242420656;
@@ -62,6 +63,7 @@ route fd01:470:7d4c::/48 max 64 as 64600;
 route fd01:470:f129::/48 max 64 as 4242422299;
 route fd01:5e19:11e1::/48 max 64 as 4242422506;
 route fd01:67c:2ed8::/48 max 64 as 65038;
+route fd03:4de4:6baa::/48 max 64 as 4242420309;
 route fd03:7e46:2707::/48 max 64 as 4242421928;
 route fd04:52c0:4000::/48 max 64 as 4242423585;
 route fd05:3aca:c3a0:a2c1::/64 max 64 as 0;
@@ -275,6 +277,7 @@ route fd42:42:2166::/48 max 64 as 4242423141;
 route fd42:4242:0339::/48 max 64 as 4242420339;
 route fd42:4242:0815::/48 max 64 as 4242420815;
 route fd42:4242:1337::/48 max 64 as 4242420414;
+route fd42:4242:1375::/48 max 64 as 4242421375;
 route fd42:4242:17::/48 max 64 as 4242420017;
 route fd42:4242:1842::/48 max 64 as 4242421842;
 route fd42:4242:1921::/48 max 64 as 4242421921;
@@ -387,13 +390,8 @@ route fd42:d42:d42:43::/64 max 64 as 4242420013;
 route fd42:d42:d42:43::/64 max 64 as 4242423723;
 route fd42:d42:d42::/48 max 64 as 64737;
 route fd42:d42:d42:53::/64 max 64 as 64737;
-route fd42:d42:d42:53::/64 max 64 as 4242420022;
-route fd42:d42:d42:53::/64 max 64 as 4242423955;
-route fd42:d42:d42:53::/64 max 64 as 4242420123;
-route fd42:d42:d42:53::/64 max 64 as 4242423723;
 route fd42:d42:d42:53::/64 max 64 as 4242422601;
 route fd42:d42:d42:54::/64 max 64 as 4242420119;
-route fd42:d42:d42:54::/64 max 64 as 4242422601;
 route fd42:d42:d42:54::/64 max 64 as 4242423914;
 route fd42:d42:d42:6667::/64 max 64 as 64600;
 route fd42:d42:d42:6667::/64 max 64 as 4242420101;
@@ -401,6 +399,7 @@ route fd42:d42:d42:80::/64 max 64 as 64737;
 route fd42:d42:d42:80::/64 max 64 as 4242420123;
 route fd42:d42:d42:80::/64 max 64 as 64719;
 route fd42:d42:d42:80::/64 max 64 as 4242422601;
+route fd42:d42:d42:9001::/64 max 64 as 4242421050;
 route fd42:d42:d42:9050::/64 max 64 as 4242420022;
 route fd42:d42:d42:9050::/64 max 64 as 4242420077;
 route fd42:d447:775c::/48 max 48 as 4242421070;
@@ -414,6 +413,7 @@ route fd42:dee:dee::/48 max 64 as 4242423424;
 route fd42:df42::/48 max 64 as 64773;
 route fd42:e0f1:5b4b::/48 max 64 as 4242420164;
 route fd42:e9ad:e297::/48 max 64 as 4242421369;
+route fd42:ec20:4ef1::/48 max 64 as 4242421488;
 route fd42:eef1:47b5::/48 max 64 as 4242420239;
 route fd42:f10:411::/48 max 64 as 4242422100;
 route fd42:f10:a15::/48 max 64 as 4242422100;
@@ -502,9 +502,6 @@ route fd62:7eab:c85f::/48 max 64 as 4242422681;
 route fd62:a393:3d91::/48 max 64 as 4242421128;
 route fd62:cc46:576b::/48 max 64 as 4242422809;
 route fd62:cd4d:28a1::/48 max 48 as 4242420173;
-route fd63:1e39:6f73:2929::/64 max 64 as 64654;
-route fd63:1e39:6f73:2929::/64 max 64 as 4242422718;
-route fd63:1e39:6f73:2929::/64 max 64 as 4242422480;
 route fd63:1e39:6f73::/48 max 64 as 64697;
 route fd63:1e39:6f73::/48 max 64 as 64766;
 route fd64:cafe:cafe::/48 max 64 as 4242423400;
@@ -573,9 +570,11 @@ route fd83:e002:c8a1::/48 max 64 as 64525;
 route fd84:688d:22bb::/48 max 64 as 4242423932;
 route fd85:050d:222d::/48 max 48 as 4242423954;
 route fd85:1dea:2093::/48 max 64 as 4242421009;
+route fd85:7370:a8a1::/48 max 48 as 4242421690;
 route fd86:4169:1552::/48 max 48 as 4242420823;
 route fd86:b4dc:4b1e::/48 max 64 as 65037;
 route fd86:bc21:638a::/48 max 64 as 4242420674;
+route fd88:1926:817::/48 max 64 as 4242420251;
 route fd88:2e46:4b1c:5988::/64 max 64 as 4242420017;
 route fd88:4903:4b9f:d66f::/64 max 64 as 4242420017;
 route fd88:8888:abcd::/48 max 64 as 4242420448;
@@ -677,6 +676,7 @@ route fdac:f3f:e7e2::/48 max 64 as 4242422333;
 route fdac:f820:373a::/48 max 64 as 4242422128;
 route fdad:850e:9f6a:9cb3::/64 max 64 as 4242420190;
 route fdae:e2d8:34a1::/48 max 64 as 4242420756;
+route fdae:e3cd:11d9::/48 max 48 as 4242420807;
 route fdb1:e72a:343d::/48 max 64 as 4242420207;
 route fdb2:520f:f4a7::/48 max 64 as 4242423774;
 route fdb2:a999:7f8c::/48 max 48 as 4242422389;
@@ -716,6 +716,7 @@ route fdc0:bc88:be::/48 max 64 as 4242421811;
 route fdc0:f16e:7051::/48 max 64 as 4242423567;
 route fdc1:31f:b14f::/48 max 64 as 64720;
 route fdc1:d4b:b89a::/48 max 64 as 4242423556;
+route fdc2:752c:29d1::/48 max 48 as 4242423636;
 route fdc3:10cd:ae9b::/48 max 64 as 4242420789;
 route fdc3:10cd:ae9c::/48 max 64 as 4242420789;
 route fdc3:10cd:ae9d::/48 max 64 as 4242420789;
@@ -765,6 +766,8 @@ route fdcf:3c00:e001::/48 max 64 as 4242422287;
 route fdcf:7494:4f2c::/48 max 64 as 4242420813;
 route fdcf:8538:9ad5::/48 max 64 as 4242423914;
 route fdcf:de54:13ef::/48 max 64 as 4242421508;
+route fdd0:17ea:3a52::/48 max 64 as 4242420194;
+route fdd0:77f2:44de::/48 max 48 as 4242422077;
 route fdd0:c468:8eb1::/48 max 64 as 4242423843;
 route fdd1:1c64:66fd::/48 max 64 as 4242421233;
 route fdd1:1c64:66fd::/58 max 64 as 4242421233;
@@ -810,6 +813,7 @@ route fde3:a7e3:7957::/48 max 64 as 4242423004;
 route fde4:2355:54fe::/48 max 48 as 4242420185;
 route fde6:36fc:c985::/64 max 64 as 65527;
 route fde6:402d:990d::/48 max 64 as 4242420576;
+route fde6:dee3:615d::/48 max 48 as 4242422103;
 route fde7:32ae:ee77::/48 max 64 as 4242422777;
 route fde7:56e7:ead3::/48 max 64 as 4242420246;
 route fde7:76fd:7444::/48 max 64 as 4242420157;