diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw
index ad009a68f4beb1f1892b1e919e696e1b2394fb96..8afb64dec1f701fbbbdc45c2a40229e1a68fd35e 100644
--- a/src/uncategorized/generateXYSlave.tw
+++ b/src/uncategorized/generateXYSlave.tw
@@ -451,16 +451,16 @@
 	<<switch $activeSlave.nationality>>
 	<<case "Iranian" "Moroccan" "Afghan" "Tunisian">>
 		<<set $activeSlave.foreskin = 100>>
-	<<case "Turkish" "Nigerian" "Iraqi" "Yemeni" "Jordanian" "Gabonese">>
+	<<case "Turkish" "Nigerian" "Iraqi" "Yemeni" "Jordanian" "Gabonese" "Tajik">>
 		<<set $activeSlave.foreskin = 99>>
-	<<case "Algerian" "Maldivian">>
+	<<case "Algerian" "Maldivian" "Azerbaijani">>
 		<<set $activeSlave.foreskin = 98>>
 	<<case "Saudi" "Uzbek" "Libyan" "Djiboutian">>
 		<<set $activeSlave.foreskin = 97>>
-	<<case "Congolese" "Pakistani" "Nigerien">>
+	<<case "Congolese" "Pakistani" "Nigerien" "Turkmen">>
 		/% Population-weighted average of Democratic Republic of Congo and Republic of Congo %/
 		<<set $activeSlave.foreskin = 96>>
-	<<case "Egyptian" "Tuvaluan" "Malagasy" "Nauruan">>
+	<<case "Egyptian" "Tuvaluan" "Malagasy" "Nauruan" "a Cook Islander" "Niuean" "Palauan" "Samoan" "a Solomon Islander" "Tongan" "Ni-Vanuatu">>
 		<<set $activeSlave.foreskin = 95>>
 	<<case "Cameroonian">>
 		<<set $activeSlave.foreskin = 94>>
@@ -468,23 +468,25 @@
 		<<set $activeSlave.foreskin = 93>>
 	<<case "Israeli" "Ghanan" "Ethiopian" "Filipina" "Kosovan">>
 		<<set $activeSlave.foreskin = 92>>
-	<<case "Kenyan">>
+	<<case "Kenyan" "Kyrgyz" "Palestinian">>
 		<<set $activeSlave.foreskin = 91>>
 	<<case "Omani">>
 		<<set $activeSlave.foreskin = 88>>
-	<<case "Malian">>
+	<<case "Malian" "Kuwaiti">>
 		<<set $activeSlave.foreskin = 86>>
-	<<case "American")>>
+	<<case "Bahraini">>
+		<<set $activeSlave.foreskin = 81>>
+	<<case "American" "Qatari">>
 		<<set $activeSlave.foreskin = 77>>
 	<<case "Emirati">>
 		<<set $activeSlave.foreskin = 76>>
 	<<case "Tanzanian">>
 		<<set $activeSlave.foreskin = 72>>
-	<<case "Malaysian">>
+	<<case "Malaysian" "Burundian">>
 		<<set $activeSlave.foreskin = 61>>
 	<<case "Lebanese">>
 		<<set $activeSlave.foreskin = 60>>
-	<<case "Kazakh">>
+	<<case "Kazakh" "Fijian">>
 		<<set $activeSlave.foreskin = 56>>
 	<<case "Korean" "Bruneian">>
 		/% Population-weighted average of South Korea and North Korea. %/
@@ -510,45 +512,49 @@
 		<<set $activeSlave.foreskin = 28>>
 	<<case "Ugandan" "Australian">>
 		<<set $activeSlave.foreskin = 27>>
-	<<case "Belgian" "Thai">>
+	<<case "Belgian" "Thai" "Cypriot">>
 		<<set $activeSlave.foreskin = 23>>
 	<<case "British">>
 		<<set $activeSlave.foreskin = 21>>
-	<<case "Puerto Rican">>
+	<<case "Puerto Rican" "Scottish">>
 		<<set $activeSlave.foreskin = 20>>
 	<<case "Montenegrin">>
 		<<set $activeSlave.foreskin = 19>>
-	<<case "Singaporean">>
+	<<case "Singaporean" "Surinamese">>
 		<<set $activeSlave.foreskin = 15>>
 	<<case "Jamaican" "French" "Chinese" "Indian">>
 		<<set $activeSlave.foreskin = 14>>
-	<<case "Zambian" "Bulgarian">>
+	<<case "Zambian" "Bulgarian" "Dominican">>
 		<<set $activeSlave.foreskin = 13>>
-	<<case "Russian">>
+	<<case "Russian" "French Guianan" "Guyanese">>
 		<<set $activeSlave.foreskin = 12>>
 	<<case "German">>
 		<<set $activeSlave.foreskin = 11>>
-	<<case "Belarusian">>
+	<<case "Belarusian" "Georgian" "Papua New Guinean">>
 		<<set $activeSlave.foreskin = 10>>
 	<<case "Zimbabwean" "Japanese">>
 		<<set $activeSlave.foreskin = 9>>
-	<<case "Taiwanese">>
+	<<case "Taiwanese" "Slovene" "Sri Lankan">>
 		<<set $activeSlave.foreskin = 8>>
 	<<case "Haitian" "Spanish">>
 		<<set $activeSlave.foreskin = 7>>
-	<<case "Dutch" "Austrian" "Swiss">>
+	<<case "Dutch" "Austrian" "Swiss" "East Timorese" "Trinidadian">>
 		<<set $activeSlave.foreskin = 6>>
-	<<case "Danish" "Swedish" "Greek">>
+	<<case "Danish" "Swedish" "Greek" "a Liechtensteiner">>
 		<<set $activeSlave.foreskin = 5>>
 	<<case "Peruvian" "Serbian" "Nepalese" "Burmese" "Cambodian" "Mongolian">>
 		<<set $activeSlave.foreskin = 4>>
 	<<case "Italian" "Norwegian" "Argentinian">>
 		<<set $activeSlave.foreskin = 3>>
-	<<case "Ukrainian" "Luxembourgian">>
+	<<case "Ukrainian" "Luxembourgian" "Vincentian">>
 		<<set $activeSlave.foreskin = 2>>
-	<<case "Portuguese" "Hungarian" "Irish" "Finnish" "Brazilian" "Bermudian" "Uruguayan" "Monégasque" "Andorran" "Croatian" "Moldovan" "Panamanian">>
+	<<case "Portuguese" "Hungarian" "Irish" "Finnish" "Brazilian" "Bermudian" "Uruguayan" "Monégasque" "Andorran" "Croatian" "Moldovan" "Panamanian" "Barbadian" "Bhutanese" "Seychellois">>
 			<<set $activeSlave.foreskin = 1>>
-	<<case "Cuban" "Guatemalan" "Chilean" "Bolivian" "Venezuelan" "Lithuanian" "Slovak" "Czech" "Romanian" "Estonian" "Icelandic" "Polish" "Colombian" "Armenian" "Vietnamese" "Sammarinese" "Marshallese" "Greenlandic" "Belizean" "Costa Rican" "Salvadoran" "Micronesian" "Grenadian" "Honduran" "I-Kiribati" "Laotian" "Maltese" "Nicaraguan">>
+	<<case 	"Cuban" "Guatemalan" "Chilean" "Bolivian" "Venezuelan" "Lithuanian" "Slovak" "Czech" "Romanian" "Estonian" "Icelandic" "Polish" "Colombian" 
+			"Armenian" "Vietnamese" "Sammarinese" "Marshallese" "Greenlandic" "Belizean" "Costa Rican" "Salvadoran" "Micronesian" "Grenadian" "Honduran"
+			"I-Kiribati" "Laotian" "Maltese" "Nicaraguan" "Antiguan" "Bahamian" "Belarusian" "Dominiquais" "Ecuadorian" "Latvian" "Paraguayan" "Kittitian"
+			"Saint Lucian" "Vatican"			
+			>>
 		<<set $activeSlave.foreskin = 0>>
 	<<default>>
 		/% Some overlooked country, or possibly stateless. Use global average. %/