diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index d85afc345baa3747d54ca7dab343582f0c0bf9ab..1341b39758b54e17ee4ff8821c9a84cb9cc5c0da 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -1168,76 +1168,80 @@
 	<</if>>
 
 	<<set $RESMove = []>>
-	<<if $TSS.schoolUpgrade != 0>>
-		<<if $TSS.schoolPresent == 0>>
-			<<if $TSS.schoolAnnexed == 0>>
-				<<set $events.push("RES Move")>>
-				<<set $events.push("RES Move")>>
-				<<set $RESMove.push("TSS")>>
+	<<if ($seeDicks != 100)>> /* is the player ok with seeing vaginas? */
+		<<if $TSS.schoolUpgrade != 0>>
+			<<if $TSS.schoolPresent == 0>>
+				<<if $TSS.schoolAnnexed == 0>>
+					<<set $events.push("RES Move")>>
+					<<set $events.push("RES Move")>>
+					<<set $RESMove.push("TSS")>>
+				<</if>>
 			<</if>>
 		<</if>>
-	<</if>>
-	<<if $GRI.schoolUpgrade != 0>>
-		<<if $GRI.schoolPresent == 0>>
-			<<if $GRI.schoolAnnexed == 0>>
-				<<set $events.push("RES Move")>>
-				<<set $events.push("RES Move")>>
-				<<set $RESMove.push("GRI")>>
+		<<if $GRI.schoolUpgrade != 0>>
+			<<if $GRI.schoolPresent == 0>>
+				<<if $GRI.schoolAnnexed == 0>>
+					<<set $events.push("RES Move")>>
+					<<set $events.push("RES Move")>>
+					<<set $RESMove.push("GRI")>>
+				<</if>>
 			<</if>>
 		<</if>>
-	<</if>>
-	<<if $SCP.schoolUpgrade != 0>>
-		<<if $SCP.schoolPresent == 0>>
-			<<if $SCP.schoolAnnexed == 0>>
-				<<set $events.push("RES Move")>>
-				<<set $events.push("RES Move")>>
-				<<set $RESMove.push("SCP")>>
+		<<if $SCP.schoolUpgrade != 0>>
+			<<if $SCP.schoolPresent == 0>>
+				<<if $SCP.schoolAnnexed == 0>>
+					<<set $events.push("RES Move")>>
+					<<set $events.push("RES Move")>>
+					<<set $RESMove.push("SCP")>>
+				<</if>>
 			<</if>>
 		<</if>>
-	<</if>>
-	<<if $LDE.schoolUpgrade != 0>>
-		<<if $LDE.schoolPresent == 0>>
-			<<if $LDE.schoolAnnexed == 0>>
-				<<set $events.push("RES Move")>>
-				<<set $events.push("RES Move")>>
-				<<set $RESMove.push("LDE")>>
+		<<if $HA.schoolUpgrade != 0>>
+			<<if $HA.schoolPresent == 0>>
+				<<if $HA.schoolAnnexed == 0>>
+					<<set $events.push("RES Move")>>
+					<<set $events.push("RES Move")>>
+					<<set $RESMove.push("HA")>>
+				<</if>>
 			<</if>>
 		<</if>>
-	<</if>>
-	<<if $TGA.schoolUpgrade != 0>>
-		<<if $TGA.schoolPresent == 0>>
-			<<if $TGA.schoolAnnexed == 0>>
-				<<set $events.push("RES Move")>>
-				<<set $events.push("RES Move")>>
-				<<set $RESMove.push("TGA")>>
+		<<if $TCR.schoolUpgrade != 0 && $TCR.schoolPresent == 0 && $TCR.schoolAnnexed == 0>>
+			<<set $events.push("RES Move")>>
+			<<set $events.push("RES Move")>>
+			<<set $RESMove.push("TCR")>>
+		<</if>>
+	<</if>> /* end "player is okay with vaginas" check */
+	<<if ($seeDicks != 0)>> /* begin "player is ok with dick" check */
+		<<if $LDE.schoolUpgrade != 0>>
+			<<if $LDE.schoolPresent == 0>>
+				<<if $LDE.schoolAnnexed == 0>>
+					<<set $events.push("RES Move")>>
+					<<set $events.push("RES Move")>>
+					<<set $RESMove.push("LDE")>>
+				<</if>>
 			<</if>>
 		<</if>>
-	<</if>>
-	<<if $HA.schoolUpgrade != 0>>
-		<<if $HA.schoolPresent == 0>>
-			<<if $HA.schoolAnnexed == 0>>
-				<<set $events.push("RES Move")>>
-				<<set $events.push("RES Move")>>
-				<<set $RESMove.push("HA")>>
+		<<if $TGA.schoolUpgrade != 0>>
+			<<if $TGA.schoolPresent == 0>>
+				<<if $TGA.schoolAnnexed == 0>>
+					<<set $events.push("RES Move")>>
+					<<set $events.push("RES Move")>>
+					<<set $RESMove.push("TGA")>>
+				<</if>>
 			<</if>>
 		<</if>>
-	<</if>>
-	<<if $TCR.schoolUpgrade != 0 && $TCR.schoolPresent == 0 && $TCR.schoolAnnexed == 0>>
-		<<set $events.push("RES Move")>>
-		<<set $events.push("RES Move")>>
-		<<set $RESMove.push("TCR")>>
-	<</if>>
-	<<if $TFS.schoolUpgrade != 0>>
-		<<if $TFS.schoolPresent == 0>>
-			<<if $TFS.schoolAnnexed == 0>>
-				<<set $events.push("RES Move")>>
-				<<set $events.push("RES Move")>>
-				<<set $RESMove.push("TFS")>>
-				<<if ($PC.dick == 1) && ($PC.vagina == 1) && ($PC.boobs == 1)>>
+		<<if $TFS.schoolUpgrade != 0>>
+			<<if $TFS.schoolPresent == 0>>
+				<<if $TFS.schoolAnnexed == 0>>
 					<<set $events.push("RES Move")>>
 					<<set $events.push("RES Move")>>
 					<<set $RESMove.push("TFS")>>
-					<<set $RESMove.push("TFS")>>
+					<<if ($PC.dick == 1) && ($PC.vagina == 1) && ($PC.boobs == 1)>>
+						<<set $events.push("RES Move")>>
+						<<set $events.push("RES Move")>>
+						<<set $RESMove.push("TFS")>>
+						<<set $RESMove.push("TFS")>>
+					<</if>>
 				<</if>>
 			<</if>>
 		<</if>>