diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw
index 73ab546f976d9d819e780f2634e463bce949fab3..eb04c6b2308dd8869c301cb5ed5aa5b1c6318d3a 100644
--- a/src/SpecialForce/Firebase.tw
+++ b/src/SpecialForce/Firebase.tw
@@ -30,10 +30,10 @@
 	<<print Interactions()>>
 	<<include "WC">>
 
-	<<if ndef $SF.MercCon.View && ($SF.Colonel.Fun + $SF.Colonel.Talk < 1)>>
+	<<if $SF.MercCon.CanAttend === -2 && ($SF.Colonel.Fun + $SF.Colonel.Talk < 1)>> 
 		<br><br>Her expression changes as something jogs her memory. "Before we begin <<if $SF.Colonel.Core == "brazen">><<= properTitle()>><<else>>boss<</if>>, back when I was a merc me and a couple of my old friends would have a meetup every several months. Drinking, fucking, drugs... a little poker. It eventually grew into a whole thing, and now we bring our latest and greatest toys to show off, maybe make some money off selling the schematics. I'd like to continue going, for old times' sake."
-		<br>[[Grant leave|Firebase][$SF.MercCon.CanAttend = 1,$SF.MercCon.View = 1]]
-		<br>[[Request she remain on base|Firebase][$SF.MercCon.CanAttend = -2,$SF.MercCon.View = 0]]<br>
+		<br>[[Grant leave|Firebase][$SF.MercCon.CanAttend = 1]]
+		<br>[[Request she remain on base|Firebase][$SF.MercCon.CanAttend = -3]]<br>
 	<</if>>
 
 	<<if $SF.MercCon.History >= 1>>
diff --git a/src/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index be82f5c1104d5723b07cd1a697ba25d60de11d24..ca01cfc9f894b19bd8520fe63a5f678ff467d0c4 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -14,7 +14,7 @@ window.Colonel = function() {
 };
 window.MercCon = function() {
  const V=State.variables;
- V.SF.MercCon={History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0};
+ V.SF.MercCon={History:0, CanAttend:-2, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0};
 };
 window.Facility = function() {
  const V=State.variables;
@@ -97,7 +97,7 @@ window.SFBC = function() {
 				TotalMenials:V.TotalTradeShowHelots,
 				Mercs:0,
 				TotalMercs:0}; TradeShow();
-			if (V.SF.MercCon.History > 0) V.SF.MercCon.View=1;
+			if (V.SF.MercCon.History > 0) V.SF.MercCon.CanAttend = 1;
 
 			if (V.securityForceHeavyBattleTank === undefined) V.securityForceHeavyBattleTank=0;
 			if (V.securityForceSpacePlanePower === undefined) V.securityForceSpacePlanePower=0;
@@ -131,6 +131,7 @@ window.SFBC = function() {
 			SFInit();
 		}
 	} else {
+		if (SF.MercCon.View) delete SF.MercCon.View;
 		if (V.SFUC > 0) V.SF.UC.num=V.SFUC; delete V.SFUC;
 		if (V.SF.Active === -1) SFInit();
 		if (V.SF.MWU) delete V.SF.MWU;
@@ -346,7 +347,7 @@ window.SFReport = function() {
 	r += `<br>&nbsp;Accountability: `;
 		r += `<span id="accountability"> <<if $SF.Regs === "strict">>''Strict Accountability''<<elseif $SF.Regs === "some">>''Some Accountability''<<else>>''No Accountability''<</if>></span>.&nbsp;&nbsp;`;
 		r += `<<link "Strict Accountability">> <<set $SF.Regs="strict">> <<replace "#accountability">>''Strict Accountability''<</replace>> <</link>> | <<link "Some Accountability">> <<set $SF.Regs="some">> <<replace "#accountability">>''Some Accountability''<</replace>> <</link>> | <<link "No Accountability">> <<set $SF.Regs="none">> <<replace "#accountability">>''No Accountability''<</replace>> <</link>>`;
-	if (V.SF.MercCon.View > 0 && V.SF.MercCon.CanAttend === 1) {
+	if (V.SF.MercCon.CanAttend === 1) {
 		V.SF.MercCon.Income=0; V.SF.MercCon.Menials=0;
 		let tradeShowAttendes=200, menialGiftsPerAttendee=5, NewMercs=0;
 		let menialGifts=Math.ceil(jsRandom(1,((tradeShowAttendes*menialGiftsPerAttendee)/10)));
@@ -401,6 +402,7 @@ window.Count = function() {
 	if (V.SF.IntroProgress > -1) delete V.SF.IntroProgress;
 	if (V.SF.MercCon === undefined) MercCon();
 	if (V.SF.Size === T.max) delete V.SF.Upgrade;
+	if (V.SF.MercCon.CanAttend !== -2 || V.SF.MercCon.CanAttend !== -3) V.SF.MercCon.CanAttend = -1;
 };
 
 window.SFNameCapsCheck = function() {
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 64b03fe8c148bf095b275a50d8cd198ef5184e78..51d7243aecbad83fb56aba5dc6be5f72b9f393f9 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -407,8 +407,6 @@
 	<<script>>Save.autosave.save("Week Start Autosave")<</script>>
 <</if>>
 
-<<if $SF.Toggle && $SF.Active >= 1 && $SF.MercCon.CanAttend > -1 && $SF.MercCon.CanAttend > -2>>
-	<<set $SF.MercCon.CanAttend = -1>>
-<</if>>
+<<if $SF.Toggle && $SF.Active >= 1>> <<= Count()>> <</if>>
 <<set $NaNArray = findNaN()>>
 <<goto "Main">>