diff --git a/configs/bird/bird.conf b/configs/bird/bird.conf
index 7992c83..8750242 100644
--- a/configs/bird/bird.conf
+++ b/configs/bird/bird.conf
@@ -3,538 +3,646 @@
 log "var/bird.log" all;
 
 
-table rtup;
-table igptable;
+ipv4 table rtup;
+ipv4 table igptable;
 
 template bgp peering {
-	local as 47065;
-	allow local as;
-	table rtup;
-	igp table igptable;
-	# add paths rx;
-	import all;
-}
-
-function safe_announcement ()
-{
-	
+    local as 47065;
+    allow local as;
+    connect retry time 60;
+    ipv4 {
+        table rtup;
+        igp table igptable;
+        # add paths rx;
+        import none;
+    };
+}
+
+function safe_announcement (){
+    
     if ! ( net ~ [
-            66.180.190.0/23{23,24}, 138.185.228.0/22{22,24}, 184.164.224.0/19{19,24}, 199.36.157.0/24{24,24}, 204.9.168.0/22{22,24}, 208.87.172.0/23{23,24}
+            66.180.190.0/23{23,24}, 138.185.228.0/22{22,24}, 147.28.10.0/23{23,24}, 184.164.224.0/19{19,24}, 199.36.157.0/24{24,24}, 204.9.168.0/22{22,24}, 208.87.172.0/23{23,24}
             ] ) then {
         return false;
     }
 
-	return true;
+    return true;
 }
 
 
 protocol bgp amsterdam01 from peering {
-	
+    
 	neighbor 100.69.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_amsterdam01_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_amsterdam01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp cfuseast1 from peering {
-	
+    
 	neighbor 100.119.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_cfuseast1_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_cfuseast1_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp clemson01 from peering {
-	
+    
 	neighbor 100.80.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_clemson01_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_clemson01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp grnet01 from peering {
-	
+    
 	neighbor 100.73.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_grnet01_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_grnet01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp isi01 from peering {
-	
+    
 	neighbor 100.66.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_isi01_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_isi01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp neu01 from peering {
-	
+    
 	neighbor 100.78.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_neu01_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_neu01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp saopaulo01 from peering {
-	
+    
 	neighbor 100.83.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_saopaulo01_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_saopaulo01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp seattle01 from peering {
-	
+    
 	neighbor 100.65.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_seattle01_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_seattle01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp ufmg01 from peering {
-	
+    
 	neighbor 100.71.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_ufmg01_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_ufmg01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp utah01 from peering {
-	
+    
 	neighbor 100.81.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_utah01_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_utah01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp uw01 from peering {
-	
+    
 	neighbor 100.74.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_uw01_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_uw01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtramsterdam from peering {
-	
+    
 	neighbor 100.89.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtramsterdam_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtramsterdam_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtratlanta from peering {
-	
+    
 	neighbor 100.88.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtratlanta_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtratlanta_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrbangalore from peering {
-	
+    
 	neighbor 100.104.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrbangalore_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrbangalore_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrchicago from peering {
-	
+    
 	neighbor 100.94.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrchicago_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrchicago_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrdallas from peering {
-	
+    
 	neighbor 100.99.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrdallas_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrdallas_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrdelhi from peering {
-	
+    
 	neighbor 100.105.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrdelhi_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrdelhi_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrfrankfurt from peering {
-	
+    
 	neighbor 100.92.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrfrankfurt_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrfrankfurt_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrhonolulu from peering {
-	
+    
 	neighbor 100.118.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrhonolulu_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrhonolulu_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrjohannesburg from peering {
-	
+    
 	neighbor 100.113.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrjohannesburg_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrjohannesburg_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrlondon from peering {
-	
+    
 	neighbor 100.108.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrlondon_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrlondon_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrlosangelas from peering {
-	
+    
 	neighbor 100.106.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrlosangelas_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrlosangelas_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrmadrid from peering {
-	
+    
 	neighbor 100.102.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrmadrid_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrmadrid_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrmanchester from peering {
-	
+    
 	neighbor 100.116.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrmanchester_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrmanchester_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrmelbourne from peering {
-	
+    
 	neighbor 100.111.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrmelbourne_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrmelbourne_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrmexico from peering {
-	
+    
 	neighbor 100.100.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrmexico_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrmexico_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrmiami from peering {
-	
+    
 	neighbor 100.87.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrmiami_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrmiami_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrmumbai from peering {
-	
+    
 	neighbor 100.109.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrmumbai_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrmumbai_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrnewjersey from peering {
-	
+    
 	neighbor 100.121.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrnewjersey_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrnewjersey_*";
+            reject;
+        };
+    };
+}
+
+protocol bgp vtrnewyork from peering {
+    
+	neighbor 100.98.128.1 as 47065;
+
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrnewyork_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrosaka from peering {
-	
+    
 	neighbor 100.114.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrosaka_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrosaka_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrparis from peering {
-	
+    
 	neighbor 100.95.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrparis_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrparis_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrsantiago from peering {
-	
+    
 	neighbor 100.115.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrsantiago_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrsantiago_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrsaopaulo from peering {
-	
+    
 	neighbor 100.112.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrsaopaulo_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrsaopaulo_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrseattle from peering {
-	
+    
 	neighbor 100.93.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrseattle_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrseattle_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrseoul from peering {
-	
+    
 	neighbor 100.110.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrseoul_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrseoul_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrsilicon from peering {
-	
+    
 	neighbor 100.107.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrsilicon_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrsilicon_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrsingapore from peering {
-	
+    
 	neighbor 100.96.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrsingapore_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrsingapore_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrstockholm from peering {
-	
+    
 	neighbor 100.103.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrstockholm_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrstockholm_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrsydney from peering {
-	
+    
 	neighbor 100.91.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrsydney_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrsydney_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrtelaviv from peering {
-	
+    
 	neighbor 100.117.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrtelaviv_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrtelaviv_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrtokyo from peering {
-	
+    
 	neighbor 100.90.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrtokyo_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrtokyo_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrtoronto from peering {
-	
+    
 	neighbor 100.101.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrtoronto_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrtoronto_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrwarsaw from peering {
-	
+    
 	neighbor 100.97.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrwarsaw_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrwarsaw_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp wisc01 from peering {
-	
+    
 	neighbor 100.75.128.1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_wisc01_*";
-		reject;
-	};
+    ipv4 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_wisc01_*";
+            reject;
+        };
+    };
 }
 
 
 protocol kernel {
-	table rtup;
-	kernel table 20000;
-	export all;
-	import none;
-	scan time 10;
-	learn off;
-	persist on;
-	graceful restart on;
-	device routes off;
+    kernel table 20000;
+    ipv4 {
+        table rtup;
+        export all;
+        import none;
+    };
+    scan time 10;
+    learn off;
+    persist on;
+    graceful restart on;
 }
 
 protocol static {
-	table rtup;
-	include "route-announcements/*";
+    ipv4 {
+        table rtup;
+    };
+    include "route-announcements/*";
 }
 
 protocol device {
-	scan time 10;
+    scan time 10;
 }
 
 protocol direct {
-	table igptable;
-	interface "tap*";
+    ipv4 {
+        table igptable;
+    };
+    interface "tap*";
 }
diff --git a/configs/bird6/bird6.conf b/configs/bird6/bird6.conf
index fb2c7a2..170544f 100644
--- a/configs/bird6/bird6.conf
+++ b/configs/bird6/bird6.conf
@@ -10,538 +10,646 @@
 log "var/bird6.log" all;
 
 
-table rtup;
-table igptable;
+ipv6 table rtup;
+ipv6 table igptable;
 
 template bgp peering {
-	local as 47065;
-	allow local as;
-	table rtup;
-	igp table igptable;
-	# add paths rx;
-	import all;
-}
-
-function safe_announcement ()
-{
-	
+    local as 47065;
+    allow local as;
+    connect retry time 60;
+    ipv6 {
+        table rtup;
+        igp table igptable;
+        # add paths rx;
+        import none;
+    };
+}
+
+function safe_announcement (){
+    
     if ! ( net ~ [
-            2604:4540::/48{48,48}, 2620:33:c000::/48{48,48}, 2804:269c::/42{42,48}
+            2602:f83d:80::/43{43,48}, 2604:4540::/48{48,48}, 2620:33:c000::/48{48,48}, 2804:269c::/42{42,48}
             ] ) then {
         return false;
     }
 
-	return true;
+    return true;
 }
 
 
 protocol bgp amsterdam01 from peering {
-	
+    
 	neighbor 2804:269c:ff00:5:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_amsterdam01_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_amsterdam01_*";
+            reject;
+        };
+    };
 }
 
-protocol bgp clemson01 from peering {
-	
-	neighbor 2804:269c:ff00:10:1::1 as 47065;
+protocol bgp cfuseast1 from peering {
+    
+	neighbor 2804:269c:ff00:37:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_clemson01_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_cfuseast1_*";
+            reject;
+        };
+    };
 }
 
-protocol bgp gatech01 from peering {
-	
-	neighbor 2804:269c:ff00:6:1::1 as 47065;
+protocol bgp clemson01 from peering {
+    
+	neighbor 2804:269c:ff00:10:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_gatech01_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_clemson01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp grnet01 from peering {
-	
+    
 	neighbor 2804:269c:ff00:9:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_grnet01_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_grnet01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp isi01 from peering {
-
+    
 	neighbor 2804:269c:ff00:2:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_isi01_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_isi01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp neu01 from peering {
-	
+    
 	neighbor 2804:269c:ff00:e:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_neu01_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_neu01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp saopaulo01 from peering {
-	
+    
 	neighbor 2804:269c:ff00:13:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_saopaulo01_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_saopaulo01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp seattle01 from peering {
-	
+    
 	neighbor 2804:269c:ff00:1:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_seattle01_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_seattle01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp ufmg01 from peering {
-	
+    
 	neighbor 2804:269c:ff00:7:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_ufmg01_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_ufmg01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp utah01 from peering {
-	
+    
 	neighbor 2804:269c:ff00:11:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_utah01_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_utah01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp uw01 from peering {
-
+    
 	neighbor 2804:269c:ff00:a:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_uw01_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_uw01_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtramsterdam from peering {
-	
+    
 	neighbor 2804:269c:ff00:19:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtramsterdam_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtramsterdam_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtratlanta from peering {
-	
+    
 	neighbor 2804:269c:ff00:18:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtratlanta_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtratlanta_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrbangalore from peering {
-	
+    
 	neighbor 2804:269c:ff00:28:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrbangalore_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrbangalore_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrchicago from peering {
-	
+    
 	neighbor 2804:269c:ff00:1e:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrchicago_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrchicago_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrdallas from peering {
-	
+    
 	neighbor 2804:269c:ff00:23:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrdallas_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrdallas_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrdelhi from peering {
-	
+    
 	neighbor 2804:269c:ff00:29:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrdelhi_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrdelhi_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrfrankfurt from peering {
-	
+    
 	neighbor 2804:269c:ff00:1c:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrfrankfurt_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrfrankfurt_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrhonolulu from peering {
-	
+    
 	neighbor 2804:269c:ff00:36:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrhonolulu_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrhonolulu_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrjohannesburg from peering {
-	
+    
 	neighbor 2804:269c:ff00:31:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrjohannesburg_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrjohannesburg_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrlondon from peering {
-	
+    
 	neighbor 2804:269c:ff00:2c:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrlondon_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrlondon_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrlosangelas from peering {
-	
+    
 	neighbor 2804:269c:ff00:2a:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrlosangelas_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrlosangelas_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrmadrid from peering {
-	
+    
 	neighbor 2804:269c:ff00:26:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrmadrid_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrmadrid_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrmanchester from peering {
-	
+    
 	neighbor 2804:269c:ff00:34:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrmanchester_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrmanchester_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrmelbourne from peering {
-	
+    
 	neighbor 2804:269c:ff00:2f:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrmelbourne_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrmelbourne_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrmexico from peering {
-	
+    
 	neighbor 2804:269c:ff00:24:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrmexico_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrmexico_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrmiami from peering {
-	
+    
 	neighbor 2804:269c:ff00:17:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrmiami_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrmiami_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrmumbai from peering {
-	
+    
 	neighbor 2804:269c:ff00:2d:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrmumbai_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrmumbai_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrnewjersey from peering {
-	
+    
 	neighbor 2804:269c:ff00:39:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrnewjersey_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrnewjersey_*";
+            reject;
+        };
+    };
+}
+
+protocol bgp vtrnewyork from peering {
+    
+	neighbor 2804:269c:ff00:22:1::1 as 47065;
+
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrnewyork_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrosaka from peering {
-	
+    
 	neighbor 2804:269c:ff00:32:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrosaka_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrosaka_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrparis from peering {
-	
+    
 	neighbor 2804:269c:ff00:1f:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrparis_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrparis_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrsantiago from peering {
-	
+    
 	neighbor 2804:269c:ff00:33:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrsantiago_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrsantiago_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrsaopaulo from peering {
-	
+    
 	neighbor 2804:269c:ff00:30:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrsaopaulo_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrsaopaulo_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrseattle from peering {
-	
+    
 	neighbor 2804:269c:ff00:1d:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrseattle_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrseattle_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrseoul from peering {
-	
+    
 	neighbor 2804:269c:ff00:2e:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrseoul_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrseoul_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrsilicon from peering {
-	
+    
 	neighbor 2804:269c:ff00:2b:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrsilicon_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrsilicon_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrsingapore from peering {
-	
+    
 	neighbor 2804:269c:ff00:20:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrsingapore_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrsingapore_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrstockholm from peering {
-	
+    
 	neighbor 2804:269c:ff00:27:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrstockholm_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrstockholm_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrsydney from peering {
-	
+    
 	neighbor 2804:269c:ff00:1b:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrsydney_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrsydney_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrtelaviv from peering {
-	
+    
 	neighbor 2804:269c:ff00:35:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrtelaviv_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrtelaviv_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrtokyo from peering {
-	
+    
 	neighbor 2804:269c:ff00:1a:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrtokyo_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrtokyo_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrtoronto from peering {
-	
+    
 	neighbor 2804:269c:ff00:25:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrtoronto_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrtoronto_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp vtrwarsaw from peering {
-	
+    
 	neighbor 2804:269c:ff00:21:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_vtrwarsaw_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_vtrwarsaw_*";
+            reject;
+        };
+    };
 }
 
 protocol bgp wisc01 from peering {
-	
+    
 	neighbor 2804:269c:ff00:b:1::1 as 47065;
 
-	export filter {
-		if ! safe_announcement() then { reject; }
-		include "prefix-filters/export_wisc01_*";
-		reject;
-	};
+    ipv6 {
+        export filter {
+            if ! safe_announcement() then { reject; }
+            include "prefix-filters/export_wisc01_*";
+            reject;
+        };
+    };
 }
 
 
 protocol kernel {
-	table rtup;
-	kernel table 20000;
-	export all;
-	import none;
-	scan time 10;
-	learn off;
-	persist on;
-	graceful restart on;
-	device routes off;
+    kernel table 20000;
+    ipv6 {
+        table rtup;
+        export all;
+        import none;
+    };
+    scan time 10;
+    learn off;
+    persist on;
+    graceful restart on;
 }
 
 protocol static {
-	table rtup;
-	include "route-announcements/*";
+    ipv6 {
+        table rtup;
+    };
+    include "route-announcements/*";
 }
 
 protocol device {
-	scan time 10;
+    scan time 10;
 }
 
 protocol direct {
-	table igptable;
-	interface "tap*";
+    ipv6 {
+        table igptable;
+    };
+    interface "tap*";
 }
diff --git a/scripts/peering-config b/scripts/peering-config
index d925c1f..1952e8c 100644
--- a/scripts/peering-config
+++ b/scripts/peering-config
@@ -12,8 +12,8 @@ export bird_cfgfile="$bird_cfgs/bird.conf"
 export bird_routes="$bird_cfgs/route-announcements"
 export bird_filters="$bird_cfgs/prefix-filters"
 
-export bird6_exec="bird6"
-export birdc6_exec="birdc6"
+export bird6_exec="bird"
+export birdc6_exec="birdc"
 export bird6_sock="$varrun/bird6.ctl"
 export bird6_cfgs="$peeringdir/configs/bird6"
 export bird6_cfgfile="$bird6_cfgs/bird6.conf"