diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index 1241e938317df83c81fa124e3247e1b230ea6b47..25d697893794dbc5ca1bfb3317fa2aad4979e76f 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -87,39 +87,43 @@
 <<switch _Pass>>
 <<case "Main">>
 	
-	<<if $slaveAssignmentTab == "overview">>
-		<<if $showOneSlave == "Head Girl">>
-			<<if (_Slave.assignment != "be your Head Girl")>><<continue>><</if>>
-		<<elseif $showOneSlave == "recruit girls">>
-			<<if (_Slave.assignment != "recruit girls")>><<continue>><</if>>
-		<<elseif $showOneSlave == "guard you">>
-			<<if (_Slave.assignment != "guard you")>><<continue>><</if>>
+	<<if $useSlaveSummaryTabs == 1>>
+		<<if $slaveAssignmentTab == "overview">>
+			<<if $showOneSlave == "Head Girl">>
+				<<if (_Slave.assignment != "be your Head Girl")>><<continue>><</if>>
+			<<elseif $showOneSlave == "recruit girls">>
+				<<if (_Slave.assignment != "recruit girls")>><<continue>><</if>>
+			<<elseif $showOneSlave == "guard you">>
+				<<if (_Slave.assignment != "guard you")>><<continue>><</if>>
+			<</if>>
+			
+		<<elseif $slaveAssignmentTab == "resting">>
+			<<if _Slave.assignment != "rest">><<continue>><</if>>
+		<<elseif $slaveAssignmentTab == "stay confined">>
+			<<if (_Slave.assignment != "stay confined")>><<continue>><</if>>
+		<<elseif $slaveAssignmentTab == "take classes">>
+			<<if (_Slave.assignment != "take classes")>><<continue>><</if>>
+		<<elseif $slaveAssignmentTab == "please you">>
+			<<if (_Slave.assignment != "please you")>><<continue>><</if>>
+		<<elseif $slaveAssignmentTab == "whore">>
+			<<if (_Slave.assignment != "whore")>><<continue>><</if>>
+		<<elseif $slaveAssignmentTab == "serve the public">>
+			<<if (_Slave.assignment != "serve the public")>><<continue>><</if>>
+		<<elseif $slaveAssignmentTab == "be a servant">>
+			<<if (_Slave.assignment != "be a servant")>><<continue>><</if>>
+		<<elseif $slaveAssignmentTab == "get milked">>
+			<<if (_Slave.assignment != "get milked")>><<continue>><</if>>
+		<<elseif $slaveAssignmentTab == "work a glory hole">>
+			<<if (_Slave.assignment != "work a glory hole")>><<continue>><</if>>
+		<<elseif $slaveAssignmentTab == "be a subordinate slave">>
+			<<if (_Slave.assignment != "be a subordinate slave")>><<continue>><</if>>
+		<<elseif $slaveAssignmentTab == "all">>
+			<<if $useSlaveSummaryOverviewTab == 1>>
+				<<if (_Slave.assignment == "be your Head Girl")
+				|| (_Slave.assignment == "recruit girls")
+				|| (_Slave.assignment == "guard you")>><<continue>><</if>>
+			<</if>>
 		<</if>>
-		
-	<<elseif $slaveAssignmentTab == "resting">>
-		<<if _Slave.assignment != "rest">><<continue>><</if>>
-	<<elseif $slaveAssignmentTab == "stay confined">>
-		<<if (_Slave.assignment != "stay confined")>><<continue>><</if>>
-	<<elseif $slaveAssignmentTab == "take classes">>
-		<<if (_Slave.assignment != "take classes")>><<continue>><</if>>
-	<<elseif $slaveAssignmentTab == "please you">>
-		<<if (_Slave.assignment != "please you")>><<continue>><</if>>
-	<<elseif $slaveAssignmentTab == "whore">>
-		<<if (_Slave.assignment != "whore")>><<continue>><</if>>
-	<<elseif $slaveAssignmentTab == "serve the public">>
-		<<if (_Slave.assignment != "serve the public")>><<continue>><</if>>
-	<<elseif $slaveAssignmentTab == "be a servant">>
-		<<if (_Slave.assignment != "be a servant")>><<continue>><</if>>
-	<<elseif $slaveAssignmentTab == "get milked">>
-		<<if (_Slave.assignment != "get milked")>><<continue>><</if>>
-	<<elseif $slaveAssignmentTab == "work a glory hole">>
-		<<if (_Slave.assignment != "work a glory hole")>><<continue>><</if>>
-	<<elseif $slaveAssignmentTab == "be a subordinate slave">>
-		<<if (_Slave.assignment != "be a subordinate slave")>><<continue>><</if>>
-	<<elseif $slaveAssignmentTab == "all">>
-		<<if (_Slave.assignment == "be your Head Girl")
-		|| (_Slave.assignment == "recruit girls")
-		|| (_Slave.assignment == "guard you")>><<continue>><</if>>
 	<</if>>
 	
 	<<if (_Slave.choosesOwnClothes == 1) && (_Slave.clothes == "choosing her own clothes")>>