diff --git a/src/interaction/slaveInteract.js b/src/interaction/slaveInteract.js
index 093c31365a108a29a78cb974793d58493009e902..ae78eca65a23fb5f8761004d2fd86a17c427e90e 100644
--- a/src/interaction/slaveInteract.js
+++ b/src/interaction/slaveInteract.js
@@ -2,7 +2,7 @@
 App.UI.SlaveInteract = {};
 
 App.UI.SlaveInteract.placeInLine = function(slave) {
-	V.slavesInLine = [];
+	let slavesInLine = [];
 	let activeSlaveIndex = V.slaveIndices[slave.ID];
 	let SL = V.slaves.length;
 
@@ -14,7 +14,7 @@ App.UI.SlaveInteract.placeInLine = function(slave) {
 				continue;
 			}
 			if (assignmentVisible(V.slaves[pil])) {
-				V.slavesInLine.push(pil); /* index of the previous slave in line */
+				slavesInLine.push(pil); /* index of the previous slave in line */
 				break;
 			}
 		}
@@ -25,7 +25,7 @@ App.UI.SlaveInteract.placeInLine = function(slave) {
 				continue;
 			}
 			if (assignmentVisible(V.slaves[pil])) {
-				V.slavesInLine.push(pil); /* index of the next slave in line */
+				slavesInLine.push(pil); /* index of the next slave in line */
 				break;
 			}
 		}
@@ -37,7 +37,7 @@ App.UI.SlaveInteract.placeInLine = function(slave) {
 				continue;
 			}
 			if (V.slaves[pil].assignment === slave.assignment) {
-				V.slavesInLine.push(pil); /* index of the previous slave in line */
+				slavesInLine.push(pil); /* index of the previous slave in line */
 				break;
 			}
 		}
@@ -48,18 +48,18 @@ App.UI.SlaveInteract.placeInLine = function(slave) {
 				continue;
 			}
 			if (V.slaves[pil].assignment === slave.assignment) {
-				V.slavesInLine.push(pil); /* index of the next slave in line */
+				slavesInLine.push(pil); /* index of the next slave in line */
 				break;
 			}
 		}
 	}
 
-	if (V.slavesInLine.length === 0) {
+	if (slavesInLine.length === 0) {
 		/* if there are no other slaves available, set previous/next slave to self */
-		V.slavesInLine[0] = activeSlaveIndex;
-		V.slavesInLine[1] = activeSlaveIndex;
+		slavesInLine[0] = activeSlaveIndex;
+		slavesInLine[1] = activeSlaveIndex;
 	}
-	return;
+	return slavesInLine;
 };
 
 App.UI.SlaveInteract.fucktoyPref = function(slave) {
diff --git a/src/uncategorized/nextSlaveInLine.tw b/src/uncategorized/nextSlaveInLine.tw
deleted file mode 100644
index 26c8fdd05fcf23f1b6619ac024eeb90ad1bd40a0..0000000000000000000000000000000000000000
--- a/src/uncategorized/nextSlaveInLine.tw
+++ /dev/null
@@ -1,12 +0,0 @@
-:: Next Slave In Line
-
-<<silently>>
-
-<<set $i = $slaveIndices[$activeSlave.ID]>>
-<<set $slaves[$i] = $activeSlave>> /* save changes before switching */
-
-<<set $activeSlave = $slaves[$slavesInLine[1]]>>
-
-<<goto "Slave Interact">>
-
-<</silently>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index f2b9ae2cc784bff7c5d9441bdf0a07650c57265d..385b76fac44777b8d8008b248dc6ed0b5b7b3806 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -351,7 +351,7 @@
 <<set $boobsID = -1, $boobsInterestTargetID = -1, $buttslutID = -1, $buttslutInterestTargetID = -1, $cumslutID = -1, $cumslutInterestTargetID = -1, $humiliationID = -1, $humiliationInterestTargetID = -1, $sadistID = -1, $sadistInterestTargetID = -1, $masochistID = -1, $masochistInterestTargetID = -1, $domID = -1, $dominantInterestTargetID = -1, $subID = -1, $submissiveInterestTargetID = -1>>
 
 /% Other arrays %/
-<<set $events = [], $RESSevent = [], $RESSTRevent = [], $RETSevent = [], $RECIevent = [], $RecETSevent = [], $REFIevent = [], $REFSevent = [], $PESSevent = [], $PETSevent = [], $FSAcquisitionEvents = [], $FSNonconformistEvents = [], $REAnalCowgirlSubIDs = [], $REButtholeCheckinIDs = [], $recruit = [], $RETasteTestSubIDs = [], $devotedSlaves = [], $rebelSlaves = [], $REBoobCollisionSubIDs = [], $REIfYouEnjoyItSubIDs = [], $RESadisticDescriptionSubIDs = [], $REShowerForceSubIDs = [], $RESimpleAssaultIDs = [], $RECockmilkInterceptionIDs = [], $REInterslaveBeggingIDs = [], $bedSlaves = [], $eligibleSlaves = [], $slavesInLine = []>>
+<<set $events = [], $RESSevent = [], $RESSTRevent = [], $RETSevent = [], $RECIevent = [], $RecETSevent = [], $REFIevent = [], $REFSevent = [], $PESSevent = [], $PETSevent = [], $FSAcquisitionEvents = [], $FSNonconformistEvents = [], $REAnalCowgirlSubIDs = [], $REButtholeCheckinIDs = [], $recruit = [], $RETasteTestSubIDs = [], $devotedSlaves = [], $rebelSlaves = [], $REBoobCollisionSubIDs = [], $REIfYouEnjoyItSubIDs = [], $RESadisticDescriptionSubIDs = [], $REShowerForceSubIDs = [], $RESimpleAssaultIDs = [], $RECockmilkInterceptionIDs = [], $REInterslaveBeggingIDs = [], $bedSlaves = [], $eligibleSlaves = []>>
 
 /% Slave Objects using 0 instead of null. Second most memory eaten up. %/
 <<set $activeSlave = 0, $eventSlave = 0, $slaveWithoutBonuses = 0, $subSlave = 0, $milkTap = 0, $relation = 0, $relative = 0, $relative2 = 0>>
diff --git a/src/uncategorized/previousSlaveInLine.tw b/src/uncategorized/previousSlaveInLine.tw
deleted file mode 100644
index 1120ace57780b5e09d700f9cac5ce5e4386354e2..0000000000000000000000000000000000000000
--- a/src/uncategorized/previousSlaveInLine.tw
+++ /dev/null
@@ -1,12 +0,0 @@
-:: Previous Slave In Line
-
-<<silently>>
-
-<<set $i = $slaveIndices[$activeSlave.ID]>>
-<<set $slaves[$i] = $activeSlave>> /* save changes before switching */
-
-<<set $activeSlave = $slaves[$slavesInLine[0]]>>
-
-<<goto "Slave Interact">>
-
-<</silently>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 16121dfb730a76e19882ff9ca6520d476117bc46..237dd14d7fac9d1869a3a9a51b43b9854394649a 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -51,7 +51,7 @@
 	<<set $showEncyclopedia = 1, $encyclopedia = "Gender">>
 <</if>>
 
-<<run App.UI.SlaveInteract.placeInLine($slaves[_i])>>
+<<set _slavesInLine = App.UI.SlaveInteract.placeInLine($slaves[_i])>>
 
 <<set _desc = `<<set $activeSlave = $slaves[_i]>><<include "Long Slave Description">>`>>
 
@@ -66,7 +66,7 @@
 		[←,Q]
 	</span>
 	<span id="prevSlave" style="font-weight:bold">
-		<<link "Prev" "Previous Slave In Line">><</link>>
+		<<link "Prev" "Slave Interact">><<set $slaves[_i] = $activeSlave, $activeSlave = $slaves[_slavesInLine[0]]>><</link>>
 	</span>
 	&nbsp;&nbsp;&nbsp;&nbsp;
 	<span class='slave-name'>
@@ -74,7 +74,7 @@
 	</span>
 	&nbsp;&nbsp;&nbsp;&nbsp;
 	<span id="nextSlave" style="font-weight:bold">
-		<<link "Next" "Next Slave In Line">><</link>>
+		<<link "Next" "Slave Interact">><<set $slaves[_i] = $activeSlave, $activeSlave = $slaves[_slavesInLine[1]]>><</link>>
 	</span>
 	<span class="cyan">
 		[E,→]