diff --git a/src/js/generateMarketSlave.js b/src/js/generateMarketSlave.js
index 6a317cc0df4d3bc36c50640bfa542d711afc0c04..2c0922c624bbeeb2dc1ec776a059ff73482f28ed 100644
--- a/src/js/generateMarketSlave.js
+++ b/src/js/generateMarketSlave.js
@@ -813,7 +813,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 			}
 			if (V.arcologies[market].FSChattelReligionist > 20) {
 				r += `They're rarely anything but devoted, and sometimes present interesting peccadilloes. `;
-				V.activeSlave.slaveName = jsEither([setup.chattelReligionistSlaveNames]);
+				V.activeSlave.slaveName = setup.setup.chattelReligionistSlaveNames.random();
 				if (V.activeSlave.devotion < 10) {
 					V.activeSlave.devotion += jsRandom(0, 10);
 				}
@@ -826,7 +826,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 			}
 			if (V.arcologies[market].FSRomanRevivalist > 20) {
 				r += `They've often seen things that drive any squeamishness out of them. `;
-				V.activeSlave.slaveName = jsEither([setup.romanSlaveNames]);
+				V.activeSlave.slaveName = setup.setup.romanSlaveNames.random();
 				if (jsRandom(0, 1) === 0) {
 					V.activeSlave.sexualQuirk = "unflinching";
 				}
@@ -837,19 +837,19 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 				} else {
 					r += ". ";
 				}
-				V.activeSlave.slaveName = jsEither([setup.aztecSlaveNames]);
+				V.activeSlave.slaveName = setup.setup.aztecSlaveNames.random();
 				if (jsRandom(0, 1) === 0) {
 					V.activeSlave.trust = -30;
 				}
 			} else if (V.arcologies[market].FSEgyptianRevivalist > 20) {
 				r += `They've often done things that give them a distinct appetite for perversion. `;
-				V.activeSlave.slaveName = jsEither([setup.ancientEgyptianSlaveNames]);
+				V.activeSlave.slaveName = setup.setup.ancientEgyptianSlaveNames.random();
 				if (jsRandom(0, 1) === 0) {
 					V.activeSlave.sexualQuirk = "perverted";
 				}
 			} else if (V.arcologies[market].FSEdoRevivalist > 20) {
 				r += `They have frequently absorbed much culture there. `;
-				V.activeSlave.slaveName = jsEither([setup.edoSlaveNames]);
+				V.activeSlave.slaveName = setup.setup.edoSlaveNames.random();
 				V.activeSlave.skill.entertainment = Math.clamp(V.activeSlave.skill.entertainment, 35, 100);
 			} else if (V.arcologies[market].FSArabianRevivalist > 20) {
 				r += `They've often been part of large harems in which selflessness is prized. `;
@@ -1140,7 +1140,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 			V.activeSlave.origin = "You bought her from the underage raiders' slave market.";
 			V.activeSlave.trust -= 25;
 			V.activeSlave.health += 20;
-			V.activeSlave.career = jsEither([setup.veryYoungCareers]);
+			V.activeSlave.career = setup.setup.veryYoungCareers.random();
 			V.activeSlave.birthWeek = 0;
 			if (V.activeSlave.vagina !== -1) {
 				V.activeSlave.skill.vaginal = 0;
@@ -1517,7 +1517,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 				V.activeSlave = GenerateNewSlave("XX");
 				V.activeSlave.origin = "You bought her from The Cattle Ranch.";
 				V.activeSlave.career = "a dairy slave";
-				V.activeSlave.slaveName = jsEither([setup.cowSlaveNames]);
+				V.activeSlave.slaveName = setup.setup.cowSlaveNames.random();
 				V.activeSlave.slaveSurname = 0;
 				V.activeSlave.butt = jsEither([2, 2, 3, 3, 3, 4, 4]);
 				V.activeSlave.boobs = ((V.activeSlave.physicalAge*100)*2)+jsEither([-100, -100, 0, 0, 100, 100, 200, 200, 300, 500]);
@@ -1556,7 +1556,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 				V.one_time_age_overrides_pedo_mode = 1;
 				V.oneTimeDisableDisability = 1;
 				V.activeSlave = GenerateNewSlave("XY");
-				V.activeSlave.slaveName = jsEither([setup.cowSlaveNames]);
+				V.activeSlave.slaveName = setup.setup.cowSlaveNames.random();
 				V.activeSlave.slaveSurname = 0;
 				V.activeSlave.origin = "You bought her from The Cattle Ranch.";
 				V.activeSlave.career = "a breeding bull";
@@ -1602,7 +1602,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 				V.one_time_age_overrides_pedo_mode = 1;
 				V.oneTimeDisableDisability = 1;
 				V.activeSlave = GenerateNewSlave("XX");
-				V.activeSlave.slaveName = jsEither([setup.cowSlaveNames]);
+				V.activeSlave.slaveName = setup.setup.cowSlaveNames.random();
 				V.activeSlave.slaveSurname = 0;
 				V.activeSlave.origin = "You bought her from The Cattle Ranch.";
 				V.activeSlave.career = "a dairy cow";
@@ -1977,7 +1977,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 			V.oneTimeDisableDisability = 1;
 			V.activeSlave = GenerateNewSlave("XY");
 
-			var criminal = jsEither([setup.gangCriminalPool]);
+			var criminal = setup.setup.gangCriminalPool.random();
 
 			switch (criminal) {
 				case "mule":
@@ -2204,7 +2204,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 				}
 			*/
 
-			criminal = jsEither([setup.militaryCriminalPool]);
+			criminal = setup.setup.militaryCriminalPool.random();
 
 			switch (criminal) {
 				case "spy":
@@ -2375,7 +2375,7 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 			V.oneTimeDisableDisability = 1;
 			V.activeSlave = GenerateNewSlave();
 
-			criminal = jsEither([setup.whiteCollarCriminalPool]);
+			criminal = setup.setup.whiteCollarCriminalPool.random();
 
 			switch (criminal) {
 				case "racketeering":
@@ -2482,7 +2482,7 @@ if (V.activeSlave.vagina > -1) {
 	}
 */
 
-			criminal = jsEither([setup.pettyCriminalPool]);
+			criminal = setup.setup.pettyCriminalPool.random();
 
 			switch (criminal) {
 				case "robbery":