diff --git a/src/pregmod/pregmodWidgets.tw b/src/pregmod/pregmodWidgets.tw
index e449c745de7d888a1101adcc16808aa696a0d419..e58840a876624883f525795b29689ed33743e54e 100644
--- a/src/pregmod/pregmodWidgets.tw
+++ b/src/pregmod/pregmodWidgets.tw
@@ -1550,6 +1550,7 @@ extremely pale -5
 <</if>>
 <<set $children = []>>
 
+/*
 /*testtest brother - determines how many brothers a slave has*/
 <<for $i to 0; $i < $slaves.length; $i++>>
 	<<if $slaves[$i].ID != $activeSlave.ID>>
@@ -1573,6 +1574,7 @@ extremely pale -5
 	$pronounCap is @@color:lightgreen;brothers with $children[0].slaveName.@@
 <</if>>
 <<set $children = []>>
+*/
 
 /*testtest half-sister - determines how many half-sisters a slave has*/
 <<for $i to 0; $i < $slaves.length; $i++>>
@@ -1598,6 +1600,7 @@ extremely pale -5
 <</if>>
 <<set $children = []>>
 
+/*
 /*testtest half-brother - determines how many half-brothers a slave has*/
 <<for $i to 0; $i < $slaves.length; $i++>>
 	<<if $slaves[$i].ID != $activeSlave.ID>>
@@ -1621,5 +1624,6 @@ extremely pale -5
 	$pronounCap is a @@color:lightgreen;half-brother to $children[0].slaveName.@@
 <</if>>
 <<set $children = []>>
+*/
 
 <</widget>>
\ No newline at end of file
diff --git a/src/uncategorized/newSlaveRaceNationalityAndName.tw b/src/uncategorized/newSlaveRaceNationalityAndName.tw
index e1907064012e5985d2ad4122afbc9e09a1934901..d15f84c374f5671f49637a657a5534b473b502b2 100644
--- a/src/uncategorized/newSlaveRaceNationalityAndName.tw
+++ b/src/uncategorized/newSlaveRaceNationalityAndName.tw
@@ -1,186 +1,104 @@
 :: New Slave Race Nationality and Name [nobr]
  
-<<if ($activeSlave.nationality is "American")>>
-	<<set $activeSlave.race to either("black", "middle eastern", "white", "white", "white", "latina", "latina", "asian", "amerindian", "mixed race")>>
-<<elseif ($activeSlave.nationality is "Canadian")>>
-	<<set $activeSlave.race to either("white", "white", "white", "white", "amerindian")>>
-<<elseif ($activeSlave.nationality is "Puerto Rican")>>
-	<<set $activeSlave.race to either("latina")>>
-<<elseif ($activeSlave.nationality is "Cuban")>>
-	<<set $activeSlave.race to either("latina", "black")>>
-<<elseif ($activeSlave.nationality is "Haitian")>>
-	<<set $activeSlave.race to either("black")>>
-<<elseif ($activeSlave.nationality is "Jamaican")>>
+<<switch $activeSlave.nationality>>
+
+<<case "Belarusian" "Russian" "Ukrainian" "Irish" "Icelandic" "Finnish" "Swiss" "Danish" "Norwegian" "Austrian" "Dutch" "Belgian" "Czech" "Serbian" "Portuguese" "Estonian" "Polish" "Lithuanian">>
+	<<set $activeSlave.race to either("white")>>
+<<case "Greek">>
+	<<set $activeSlave.race to either("southern European")>>
+<<case "Haitian" "Jamaican" "Nigerian" "Kenyan" "Ugandan" "Congolese">>
 	<<set $activeSlave.race to either("black")>>
-<<elseif ($activeSlave.nationality is "Mexican")>>
-	<<set $activeSlave.race to either("latina", "latina", "latina", "latina", "latina", "amerindian")>>
-<<elseif ($activeSlave.nationality is "Dominican")>>
-	<<set $activeSlave.race to either("mixed race", "mixed race", "mixed race", "mixed race", "mixed race", "mixed race", "mixed race", "white", "white", "black")>>
-<<elseif ($activeSlave.nationality is "Peruvian")>>
-	<<set $activeSlave.race to either("latina", "amerindian")>>
-<<elseif ($activeSlave.nationality is "Venezuelan")>>
+<<case "Puerto Rican" "Venezuelan" "Colombian">>
 	<<set $activeSlave.race to either("latina")>>
-<<elseif ($activeSlave.nationality is "Bolivian")>>
-	<<set $activeSlave.race to either("latina", "amerindian")>>
-<<elseif ($activeSlave.nationality is "Guatemalan")>>
+<<case "Algerian" "Libyan" "Tunisian">>
+	<<set $activeSlave.race to either("middle eastern")>>
+<<case "Indian" "Bangladeshi">>
+	<<set $activeSlave.race to either("indo-aryan")>>
+<<case "Chinese" "Korean" "Japanese" "Vietnamese" "Uzbek">>
+	<<set $activeSlave.race to either("asian")>>
+<<case "Cuban">>
+	<<set $activeSlave.race to either("latina", "black")>>
+<<case "Peruvian" "Bolivian" "Guatemalan">>
 	<<set $activeSlave.race to either("latina", "amerindian")>>
-<<elseif ($activeSlave.nationality is "Brazilian")>>
-	<<set $activeSlave.race to either("black", "latina", "mixed race", "mixed race", "amerindian", "white")>>
-<<elseif ($activeSlave.nationality is "Argentinian")>>
+<<case "Armenian">>
+	<<set $activeSlave.race to either("indo-aryan", "semitic")>>
+<<case "Lebanese" "Jordanian">>
+	<<set $activeSlave.race to either("middle eastern", "semitic")>>
+<<case "Afghan" "Emirati" "Omani">>
+	<<set $activeSlave.race to either("indo-aryan", "middle eastern")>>
+<<case "Thai">>
+	<<set $activeSlave.race to either("asian", "asian", "malay")>>
+<<case "Argentinian">>
 	<<set $activeSlave.race to either("white", "latina", "latina")>>
-<<elseif ($activeSlave.nationality is "Chilean")>>
+<<case "Burmese" "Nepalese">>
+	<<set $activeSlave.race to either("asian", "asian", "indo-aryan")>>
+<<case "Moroccan">>
+	<<set $activeSlave.race to either("middle eastern", "middle eastern", "black")>>
+<<case "Spanish">>
+	<<set $activeSlave.race to either("semitic", "southern European", "southern European")>>
+<<case "Chilean">>
 	<<set $activeSlave.race to either("white", "latina", "latina", "latina")>>
-<<elseif ($activeSlave.nationality is "Colombian")>>
-	<<set $activeSlave.race to either("latina")>>
-<<elseif ($activeSlave.nationality is "Egyptian")>>
-	<<set $activeSlave.race to either("black", "middle eastern", "middle eastern", "middle eastern", "semitic")>>
-<<elseif ($activeSlave.nationality is "Turkish")>>
-	<<set $activeSlave.race to either("middle eastern", "middle eastern", "middle eastern", "semitic")>>
-<<elseif ($activeSlave.nationality is "Iranian")>>
+<<case "Iranian" "Pakistani">>
 	<<set $activeSlave.race to either("indo-aryan", "indo-aryan", "indo-aryan", "semitic")>>
-<<elseif ($activeSlave.nationality is "Armenian")>>
-	<<set $activeSlave.race to either("indo-aryan", "semitic")>>
-<<elseif ($activeSlave.nationality is "Israeli")>>
+<<case "Israeli">>
 	<<set $activeSlave.race to either("white", "middle eastern", "semitic", "semitic")>>
-<<elseif ($activeSlave.nationality is "Saudi")>>
-	<<set $activeSlave.race to either("black", "asian", "middle eastern", "middle eastern")>>
-<<elseif ($activeSlave.nationality is "Moroccan")>>
-	<<set $activeSlave.race to either("middle eastern", "middle eastern", "black")>>
-<<elseif ($activeSlave.nationality is "Nigerian")>>
-	<<set $activeSlave.race to either("black")>>
-<<elseif ($activeSlave.nationality is "Kenyan")>>
-	<<set $activeSlave.race to either("black")>>
-<<elseif ($activeSlave.nationality is "Zimbabwean")>>
-	<<set $activeSlave.race to either("black", "black", "black", "black", "white")>>
-<<elseif ($activeSlave.nationality is "Ugandan")>>
-	<<set $activeSlave.race to either("black")>>
-<<elseif ($activeSlave.nationality is "Tanzanian")>>
+<<case "Tanzanian" "Ghanan">>
 	<<set $activeSlave.race to either("black", "black", "black", "semitic")>>
-<<elseif ($activeSlave.nationality is "Ghanan")>>
-	<<set $activeSlave.race to either("black", "black", "black", "semitic")>>
-<<elseif ($activeSlave.nationality is "Congolese")>>
-	<<set $activeSlave.race to either("black")>>
-<<elseif ($activeSlave.nationality is "Ethiopian")>>
-	<<set $activeSlave.race to either("black", "black", "black", "middle eastern", "semitic")>>
-<<elseif ($activeSlave.nationality is "South African")>>
+<<case "South African">>
 	<<set $activeSlave.race to either("black", "black", "black", "white")>>
-<<elseif ($activeSlave.nationality is "Chinese")>>
-	<<set $activeSlave.race to either("asian")>>
-<<elseif ($activeSlave.nationality is "Korean")>>
-	<<set $activeSlave.race to either("asian")>>
-<<elseif ($activeSlave.nationality is "Japanese")>>
-	<<set $activeSlave.race to either("asian")>>
-<<elseif ($activeSlave.nationality is "Thai")>>
-	<<set $activeSlave.race to either("asian", "asian", "malay")>>
-<<elseif ($activeSlave.nationality is "Vietnamese")>>
-	<<set $activeSlave.race to either("asian")>>
-<<elseif ($activeSlave.nationality is "Indonesian")>>
-	<<set $activeSlave.race to either("asian", "malay", "malay", "pacific islander")>>
-<<elseif ($activeSlave.nationality is "Filipina")>>
-	<<set $activeSlave.race to either("asian", "malay", "malay", "pacific islander")>>
-<<elseif ($activeSlave.nationality is "Burmese")>>
-	<<set $activeSlave.race to either("asian", "asian", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Nepalese")>>
-	<<set $activeSlave.race to either("asian", "asian", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Uzbek")>>
-	<<set $activeSlave.race to either("asian")>>
-<<elseif ($activeSlave.nationality is "Afghan")>>
-	<<set $activeSlave.race to either("indo-aryan", "middle eastern")>>
-<<elseif ($activeSlave.nationality is "Algerian")>>
-	<<set $activeSlave.race to either("middle eastern")>>
-<<elseif ($activeSlave.nationality is "Libyan")>>
-	<<set $activeSlave.race to either("middle eastern")>>
-<<elseif ($activeSlave.nationality is "Tunisian")>>
-	<<set $activeSlave.race to either("middle eastern")>>
-<<elseif ($activeSlave.nationality is "Lebanese")>>
-	<<set $activeSlave.race to either("middle eastern", "semitic")>>
-<<elseif ($activeSlave.nationality is "Jordanian")>>
-	<<set $activeSlave.race to either("middle eastern", "semitic")>>
-<<elseif ($activeSlave.nationality is "Emirati")>>
-	<<set $activeSlave.race to either("middle eastern", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Omani")>>
-	<<set $activeSlave.race to either("middle eastern", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Malian")>>
-	<<set $activeSlave.race to either("black", "black", "black", "black", "black", "middle eastern")>>
-<<elseif ($activeSlave.nationality is "Sudanese")>>
+<<case "Sudanese">>
 	<<set $activeSlave.race to either("black", "black", "black", "middle eastern")>>
-<<elseif ($activeSlave.nationality is "Yemeni")>>
-	<<set $activeSlave.race to either("black", "semitic", "middle eastern", "middle eastern", "middle eastern")>>
-<<elseif ($activeSlave.nationality is "Iraqi")>>
-	<<set $activeSlave.race to either("semitic", "middle eastern", "middle eastern", "middle eastern", "middle eastern")>>
-<<elseif ($activeSlave.nationality is "Indian")>>
-	<<set $activeSlave.race to either("indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Malaysian")>>
+<<case "Malaysian">>
 	<<set $activeSlave.race to either("asian", "malay", "malay", "malay")>>
-<<elseif ($activeSlave.nationality is "Kazakh")>>
-	<<set $activeSlave.race to either("asian", "asian", "asian", "semitic", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Pakistani")>>
-	<<set $activeSlave.race to either("indo-aryan", "indo-aryan", "indo-aryan", "semitic")>>
-<<elseif ($activeSlave.nationality is "Bangladeshi")>>
-	<<set $activeSlave.race to either("indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Belarusian")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Russian")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Ukrainian")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Irish")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Icelandic")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Finnish")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Swiss")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Danish")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Norwegian")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Austrian")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Slovak")>>
-	<<set $activeSlave.race to either("white", "white", "white", "white", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Dutch")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Belgian")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Czech")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Serbian")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Portuguese")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Hungarian")>>
+<<case "Indonesian" "Filipina">>
+	<<set $activeSlave.race to either("asian", "malay", "malay", "pacific islander")>>
+<<case "Australian">>
+	<<set $activeSlave.race to either("white", "white", "black", "asian")>>
+<<case "Saudi">>
+	<<set $activeSlave.race to either("black", "asian", "middle eastern", "middle eastern")>>
+<<case "Slovak" "Hungarian">>
 	<<set $activeSlave.race to either("white", "white", "white", "white", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "Estonian")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Polish")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Lithuanian")>>
-	<<set $activeSlave.race to either("white")>>
-<<elseif ($activeSlave.nationality is "Romanian")>>
+<<case "Canadian">>
+	<<set $activeSlave.race to either("white", "white", "white", "white", "amerindian")>>
+<<case "Zimbabwean">>
+	<<set $activeSlave.race to either("black", "black", "black", "black", "white")>>
+<<case "Swedish">>
+	<<set $activeSlave.race to either("middle eastern", "white", "white", "white", "white")>>
+<<case "Ethiopian">>
+	<<set $activeSlave.race to either("black", "black", "black", "middle eastern", "semitic")>>
+<<case "Kazakh">>
+	<<set $activeSlave.race to either("asian", "asian", "asian", "semitic", "indo-aryan")>>
+<<case "Egyptian" "Turkish" "Yemeni">>
+	<<set $activeSlave.race to either("black", "middle eastern", "middle eastern", "middle eastern", "semitic")>>
+<<case "Italian">>
+	<<set $activeSlave.race to either("middle eastern", "southern European", "southern European", "white", "white")>>
+<<case "a New Zealander">>
+	<<set $activeSlave.race to either("white", "white", "white", "white", "pacific islander")>>
+<<case "Iraqi">>
+	<<set $activeSlave.race to either("semitic", "middle eastern", "middle eastern", "middle eastern", "middle eastern")>>
+<<case "Brazilian">>
+	<<set $activeSlave.race to either("black", "latina", "mixed race", "mixed race", "amerindian", "white")>>
+<<case "Mexican">>
+	<<set $activeSlave.race to either("latina", "latina", "latina", "latina", "latina", "amerindian")>>
+<<case "Romanian">>
 	<<set $activeSlave.race to either("semitic", "white", "white", "white", "white", "indo-aryan")>>
-<<elseif ($activeSlave.nationality is "German")>>
+<<case "Malian">>
+	<<set $activeSlave.race to either("black", "black", "black", "black", "black", "middle eastern")>>
+<<case "American">>
+	<<set $activeSlave.race to either("black", "middle eastern", "white", "white", "white", "latina", "latina", "asian", "amerindian", "mixed race")>>
+<<case "Dominican">>
+	<<set $activeSlave.race to either("mixed race", "mixed race", "mixed race", "mixed race", "mixed race", "mixed race", "mixed race", "white", "white", "black")>>
+<<case "German">>
 	<<set $activeSlave.race to either("black", "middle eastern", "white", "white", "white", "white", "white", "white")>>
-<<elseif ($activeSlave.nationality is "Swedish")>>
-	<<set $activeSlave.race to either("middle eastern", "white", "white", "white", "white")>>
-<<elseif ($activeSlave.nationality is "French")>>
+<<case "French">>
 	<<set $activeSlave.race to either("black", "middle eastern", "white", "white", "white", "white", "white", "southern European")>>
-<<elseif ($activeSlave.nationality is "Italian")>>
-	<<set $activeSlave.race to either("middle eastern", "southern European", "southern European", "white", "white")>>
-<<elseif ($activeSlave.nationality is "Greek")>>
-	<<set $activeSlave.race to either("southern European")>>
-<<elseif ($activeSlave.nationality is "Spanish")>>
-	<<set $activeSlave.race to either("semitic", "southern European", "southern European")>>
-<<elseif ($activeSlave.nationality is "British")>>
+<<case "British">>
 	<<set $activeSlave.race to either("indo-aryan", "white", "white", "white", "white", "white", "white", "white", "white", "white")>>
-<<elseif ($activeSlave.nationality is "Scottish")>>
+<<case "Scottish">>
 	<<set $activeSlave.race to either("middle eastern", "indo-aryan", "white", "white", "white", "white", "white", "white", "white")>>
-<<elseif ($activeSlave.nationality is "Australian")>>
-	<<set $activeSlave.race to either("white", "white", "black", "asian")>>
-<<elseif ($activeSlave.nationality is "a New Zealander")>>
-	<<set $activeSlave.race to either("white", "white", "white", "white", "pacific islander")>>
-<</if>>
+
+
+<</switch>>
 
 /% Begin mixed race rate adjustment. %/
 /% Some countries are extremely ethnically homogeneous and unlikely to change soon. %/