diff --git a/Actors/Sidney/ChastityBelt_TwoRopes_BallGag_Pig.png b/Actors/Sidney/ChastityBelt_TwoRopes_BallGag_Pig.png
index b437e04da7..e03e4dcb94 100644
Binary files a/Actors/Sidney/ChastityBelt_TwoRopes_BallGag_Pig.png and b/Actors/Sidney/ChastityBelt_TwoRopes_BallGag_Pig.png differ
diff --git a/Actors/Sidney/ChastityBelt_TwoRopes_ClothGag_Pig.png b/Actors/Sidney/ChastityBelt_TwoRopes_ClothGag_Pig.png
index bc1c553884..a7cacfcfd0 100644
Binary files a/Actors/Sidney/ChastityBelt_TwoRopes_ClothGag_Pig.png and b/Actors/Sidney/ChastityBelt_TwoRopes_ClothGag_Pig.png differ
diff --git a/Actors/Sidney/ChastityBelt_TwoRopes_Collar_BallGag_Pig.png b/Actors/Sidney/ChastityBelt_TwoRopes_Collar_BallGag_Pig.png
new file mode 100644
index 0000000000..5733f81395
Binary files /dev/null and b/Actors/Sidney/ChastityBelt_TwoRopes_Collar_BallGag_Pig.png differ
diff --git a/Actors/Sidney/ChastityBelt_TwoRopes_Collar_ClothGag_Pig.png b/Actors/Sidney/ChastityBelt_TwoRopes_Collar_ClothGag_Pig.png
new file mode 100644
index 0000000000..9784f29e59
Binary files /dev/null and b/Actors/Sidney/ChastityBelt_TwoRopes_Collar_ClothGag_Pig.png differ
diff --git a/Actors/Sidney/ChastityBelt_TwoRopes_Collar_NoGag_Pig.png b/Actors/Sidney/ChastityBelt_TwoRopes_Collar_NoGag_Pig.png
new file mode 100644
index 0000000000..216ee9c5bd
Binary files /dev/null and b/Actors/Sidney/ChastityBelt_TwoRopes_Collar_NoGag_Pig.png differ
diff --git a/Actors/Sidney/ChastityBelt_TwoRopes_Collar_TapeGag_Pig.png b/Actors/Sidney/ChastityBelt_TwoRopes_Collar_TapeGag_Pig.png
new file mode 100644
index 0000000000..ada5b90a83
Binary files /dev/null and b/Actors/Sidney/ChastityBelt_TwoRopes_Collar_TapeGag_Pig.png differ
diff --git a/Actors/Sidney/ChastityBelt_TwoRopes_NoGag_Pig.png b/Actors/Sidney/ChastityBelt_TwoRopes_NoGag_Pig.png
index b867dfb41b..4f0c76e2f3 100644
Binary files a/Actors/Sidney/ChastityBelt_TwoRopes_NoGag_Pig.png and b/Actors/Sidney/ChastityBelt_TwoRopes_NoGag_Pig.png differ
diff --git a/Actors/Sidney/ChastityBelt_TwoRopes_TapeGag_Pig.png b/Actors/Sidney/ChastityBelt_TwoRopes_TapeGag_Pig.png
index ab72ee0e0f..3c14496725 100644
Binary files a/Actors/Sidney/ChastityBelt_TwoRopes_TapeGag_Pig.png and b/Actors/Sidney/ChastityBelt_TwoRopes_TapeGag_Pig.png differ
diff --git a/Actors/Sidney/Naked_TwoRopes_BallGag_Pig.png b/Actors/Sidney/Naked_TwoRopes_BallGag_Pig.png
index d6ff5200f7..08bf3748a7 100644
Binary files a/Actors/Sidney/Naked_TwoRopes_BallGag_Pig.png and b/Actors/Sidney/Naked_TwoRopes_BallGag_Pig.png differ
diff --git a/Actors/Sidney/Naked_TwoRopes_ClothGag_Pig.png b/Actors/Sidney/Naked_TwoRopes_ClothGag_Pig.png
index 7b1ff801cc..24d742a6f1 100644
Binary files a/Actors/Sidney/Naked_TwoRopes_ClothGag_Pig.png and b/Actors/Sidney/Naked_TwoRopes_ClothGag_Pig.png differ
diff --git a/Actors/Sidney/Naked_TwoRopes_Collar_BallGag_Pig.png b/Actors/Sidney/Naked_TwoRopes_Collar_BallGag_Pig.png
new file mode 100644
index 0000000000..ec326102fb
Binary files /dev/null and b/Actors/Sidney/Naked_TwoRopes_Collar_BallGag_Pig.png differ
diff --git a/Actors/Sidney/Naked_TwoRopes_Collar_ClothGag_Pig.png b/Actors/Sidney/Naked_TwoRopes_Collar_ClothGag_Pig.png
new file mode 100644
index 0000000000..15608afacb
Binary files /dev/null and b/Actors/Sidney/Naked_TwoRopes_Collar_ClothGag_Pig.png differ
diff --git a/Actors/Sidney/Naked_TwoRopes_Collar_NoGag_Pig.png b/Actors/Sidney/Naked_TwoRopes_Collar_NoGag_Pig.png
new file mode 100644
index 0000000000..a59c6f207f
Binary files /dev/null and b/Actors/Sidney/Naked_TwoRopes_Collar_NoGag_Pig.png differ
diff --git a/Actors/Sidney/Naked_TwoRopes_Collar_TapeGag_Pig.png b/Actors/Sidney/Naked_TwoRopes_Collar_TapeGag_Pig.png
new file mode 100644
index 0000000000..8a06e3e425
Binary files /dev/null and b/Actors/Sidney/Naked_TwoRopes_Collar_TapeGag_Pig.png differ
diff --git a/Actors/Sidney/Naked_TwoRopes_NoGag_Pig.png b/Actors/Sidney/Naked_TwoRopes_NoGag_Pig.png
index ae0b47d5df..a8d1ffc208 100644
Binary files a/Actors/Sidney/Naked_TwoRopes_NoGag_Pig.png and b/Actors/Sidney/Naked_TwoRopes_NoGag_Pig.png differ
diff --git a/Actors/Sidney/Naked_TwoRopes_TapeGag_Pig.png b/Actors/Sidney/Naked_TwoRopes_TapeGag_Pig.png
index 326c19098c..f80d76396e 100644
Binary files a/Actors/Sidney/Naked_TwoRopes_TapeGag_Pig.png and b/Actors/Sidney/Naked_TwoRopes_TapeGag_Pig.png differ
diff --git a/C012_AfterClass/Dorm/Script.js b/C012_AfterClass/Dorm/Script.js
index bca0e40b6e..6ba1503a8a 100644
--- a/C012_AfterClass/Dorm/Script.js
+++ b/C012_AfterClass/Dorm/Script.js
@@ -24,9 +24,9 @@ function C012_AfterClass_Dorm_DrawOtherActors() {
 	var Pos = 0;
 	for (var A = 0; A < C012_AfterClass_Dorm_Guest.length; A++)
 		if (CurrentActor != C012_AfterClass_Dorm_Guest[A]) {
-			if (Pos == 0) DrawActor(C012_AfterClass_Dorm_Guest[A], 500, 0, 0.75);
-			if (Pos == 1) DrawActor(C012_AfterClass_Dorm_Guest[A], 1000, 0, 0.75);
-			if (Pos == 2) DrawActor(C012_AfterClass_Dorm_Guest[A], 800, -30, 0.75);
+			if (Pos == 0) DrawActor(C012_AfterClass_Dorm_Guest[A], 500, -30, 0.75);
+			if (Pos == 1) DrawActor(C012_AfterClass_Dorm_Guest[A], 850, -30, 0.75);
+			if (Pos == 2) DrawActor(C012_AfterClass_Dorm_Guest[A], 675, -30, 0.75);
 			Pos++;
 		}
 }
@@ -90,7 +90,7 @@ function C012_AfterClass_Dorm_Load() {
 	StartTimer(24 * 60 * 60 * 1000, "C012_AfterClass", "Outro");
 	ActorSpecificSetPose("Amanda", "");
 	ActorSpecificSetPose("Sarah", "");
-	if ((ActorSpecificGetValue(ActorPose) != "Pig") || !ActorSpecificHasInventory("TwoRopes")) ActorSpecificSetPose("Sidney", "");
+	if ((ActorSpecificGetValue("Sidney", ActorPose) != "Pig") || !ActorSpecificHasInventory("Sidney", "TwoRopes")) ActorSpecificSetPose("Sidney", "");
 	ActorSpecificSetPose("Jennifer", "");
 	Common_BondageAllowed = true;
 	Common_SelfBondageAllowed = true;
diff --git a/C012_AfterClass/Sarah/Script.js b/C012_AfterClass/Sarah/Script.js
index 4978bfb8d7..ee71e6cb2d 100644
--- a/C012_AfterClass/Sarah/Script.js
+++ b/C012_AfterClass/Sarah/Script.js
@@ -742,4 +742,5 @@ function C012_AfterClass_Sarah_PigPictureDone() {
 function C012_AfterClass_Sarah_GetPigCostume() {
 	GameLogSpecificAdd(CurrentChapter, "Sidney", "AllowPigCostume");
 	CurrentTime = CurrentTime + 50000;
+	LeaveIcon = "Leave";
 }
\ No newline at end of file
diff --git a/C012_AfterClass/Sarah/Stage_EN.csv b/C012_AfterClass/Sarah/Stage_EN.csv
index 254f773287..98890cba3e 100644
--- a/C012_AfterClass/Sarah/Stage_EN.csv
+++ b/C012_AfterClass/Sarah/Stage_EN.csv
@@ -200,24 +200,24 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 410,0,0,,(Back to your room.),,410,0,0,BackToDorm()
 500,0,0,,What do you do|outside of shcool?,Mostly parties.  At friends|places or at my own place.,510,0,0,
 500,0,0,,You're a party|girl aren't you?,Yep!  There's always a party to go|or friends to invite at my place.,510,1,0,
-500,0,0,,Do you have|lots of friends?,"Yep, I sure do.  I love to|invite friends at my place.",510,0,0,
-500,0,0,,You seem pretty|bad at school.,I don't have good grades|but I have lots of friends.,510,-1,0,
+500,0,0,,Do you have|lots of friends?,I sure do.  I love to invite friends|over at my place to do parties.,510,0,0,
+500,0,0,,You seem pretty|bad at school.,I don't have good grades but I have|lots of friends and do many parties.,510,-1,0,
 510,0,0,,You do way too|many parties Sarah.,Boring!  My roommates also tell me that.|Sidney keeps annoying me when I bring friends.,520,0,-1,
 510,0,0,,It doesn't bother|your roommates?,"Yeah, they complain from time to time.|Sidney keeps annoying me when I bring friends.",520,0,0,
 510,0,0,,Continue to party girl.|Nothing wrong with that.,"I agree, even if my roommates complain.|Sidney keeps annoying me when I bring friends.",520,0,1,
 520,0,0,,Don't let her|annoy you.,True!  I need to teach her a lesson.,530,0,1,
 520,0,0,,"She's strong, be|careful with her.","Yeah, she's a lot troube.|I need to teach her a lesson.",530,0,-1,
 520,0,0,,What will you|do with Sidney?,"I don't know, but I certainly|need to teach her a lesson.",530,0,0,
-530,0,0,,Do you have a plan?,"Maybe if I had an humiliating picture of her,|I could blackmail her to stop bugging me.",540,0,0,
-530,0,0,,It will only|escalate the war.,"I know, but if I had an humiliating picture of|her, I could blackmail her to stop the war.",540,-1,0,
-530,0,0,,I will help you.|Do you have a plan?,"Maybe if I had an humiliating picture of her,|I could blackmail her to stop bugging me.",540,1,0,
-530,0,0,,And how can you|teach her a lesson?,"Maybe if I had an humiliating picture of her,|I could blackmail her to stop bugging me.",540,0,0,
+530,0,0,,Do you have a plan?,Maybe if I had an humiliating picture of her.|I could blackmail her to stop bugging me.,540,0,0,
+530,0,0,,It will only|escalate the war.,"I know, but if I had an humiliating picture of|her.  I could blackmail her to stop the war.",540,-1,0,
+530,0,0,,I will help you.|Do you have a plan?,Maybe if I had an humiliating picture of her.|I could blackmail her to stop bugging me.,540,1,0,
+530,0,0,,And how can you|teach her a lesson?,Maybe if I had an humiliating picture of her.|I could blackmail her to stop bugging me.,540,0,0,
 540,0,0,HasPigPicture,I already have that.|(Share a pig picture.),And it's OUTSIDE!  She will stop pestering me.|I had a similar costume ready for her.,560,3,1,PigPictureDone()
 540,0,0,,What kind of picture?,(She gives you some pig ears and tail.)|A picture of her naked with these would be perfect.,550,0,0,
 540,0,0,,I'll take that|picture for you.,Cool!  (She gives you some pig ears and tail.)|A picture of her naked with these would be perfect.,550,0,1,
 540,0,0,,It seems risky.,It's risky.  (She gives you some pig ears and tail.)|But a picture of her naked with these would be perfect.,550,0,-1,
 550,0,0,,A pig costume|for piggy Sidney!,(She gives you a thumbs up.)  Absolutely!|So what could we do now to have fun?,0,1,0,GetPigCostume()
-550,0,0,,Is this too|humiliating?,"Not at all, it's perfect for you!|So what could we do now to have fun?",0,-1,0,GetPigCostume()
+550,0,0,,Is this too|humiliating?,"Not at all, it's perfect for Sidney!|So what could we do now to have fun?",0,-1,0,GetPigCostume()
 550,0,0,,I'll try to get|you that picture.,(She gives you a thumbs up.)  Alright!|So what could we do now to have fun?,0,0,0,GetPigCostume()
 560,0,0,,Can I have the|costume?  (Blush.),Take it.  (She gives you some pig ears and tail.)|So what could we do now to have fun?,0,0,-1,GetPigCostume()
 560,0,0,,Give me that costume.,Take it.  (She gives you some pig ears and tail.)|So what could we do now to have fun?,0,0,1,GetPigCostume()
diff --git a/C012_AfterClass/Sidney/Script.js b/C012_AfterClass/Sidney/Script.js
index 743be290c2..cc583ad219 100644
--- a/C012_AfterClass/Sidney/Script.js
+++ b/C012_AfterClass/Sidney/Script.js
@@ -1015,22 +1015,27 @@ function C012_AfterClass_Sidney_ChangeBackToShort() {
 
 // Chapter 12 After Class - Sidney can only wear the pig costume when she's in 2 or 3 ropes
 function C012_AfterClass_Sidney_TestPigCostume() {
-	
-	// Give back one rope if there's three
-	if (ActorHasInventory("ThreeRopes")) {
-		ActorRemoveInventory("ThreeRopes");
-		ActorAddInventory("TwoRopes");
-		PlayerAddInventory("Rope", 1);
-	}
 
-	// Allow the pig costume if she's tied up with two ropes
-	if (ActorHasInventory("TwoRopes")) {
-		ActorSetPose("Pig");
-		CurrentTime = CurrentTime + 50000;
-		if (!GameLogQuery(CurrentChapter, "Sidney", "Pig")) {
-			OverridenIntroText = GetText("ForcePigCostumePicture");
-			GameLogAdd("Pig");
-		} else OverridenIntroText = GetText("ForcePigCostume");
+	// Only works if naked
+	if (ActorGetValue(ActorCloth) == "Naked") {
+
+		// Give back one rope if there's three
+		if (ActorHasInventory("ThreeRopes")) {
+			ActorRemoveInventory("ThreeRopes");
+			ActorAddInventory("TwoRopes");
+			PlayerAddInventory("Rope", 1);
+		}
+
+		// Allow the pig costume if she's tied up with two ropes
+		if (ActorHasInventory("TwoRopes")) {
+			ActorSetPose("Pig");
+			CurrentTime = CurrentTime + 50000;
+			if (!GameLogQuery(CurrentChapter, "Sidney", "Pig")) {
+				OverridenIntroText = GetText("ForcePigCostumePicture");
+				GameLogAdd("Pig");
+			} else OverridenIntroText = GetText("ForcePigCostume");
+		}
+	
 	}
 
 }
\ No newline at end of file
diff --git a/C012_AfterClass/Sidney/Stage_EN.csv b/C012_AfterClass/Sidney/Stage_EN.csv
index 99731ea07e..14b3993060 100644
--- a/C012_AfterClass/Sidney/Stage_EN.csv
+++ b/C012_AfterClass/Sidney/Stage_EN.csv
@@ -221,7 +221,7 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 600,0,0,,Just wear your red|shorts and black top.,Perfect!  That's what I like best.|(She changes in her shorts for you.),0,0,0,"ForceChangeActor(""Shorts"")"
 600,0,0,,Wear your|school outfit.,Fine.  But let's not go back to school.|(She changes in her school uniform.),0,0,0,"ForceChangeActor(""Clothed"")"
 600,0,0,AllowBlackLingerie,Wear your lingerie.,(She winks.)  You're so kinky.|(She changes in her lingerie for you.),0,0,0,"ForceChangeActor(""BlackLingerie"")"
-600,0,0,AllowPigCostume,Wear this pig costume.|(Show the pig costume.),Oh no!  Fuck Sarah and her costume.|There's no way in hell I'm wearing that!,0,0,0,
+600,0,0,AllowPigCostume,Wear this pig costume.|(Show the pig costume.),Oh no!  Fuck Sarah and her costume.|There's no way in hell I'm wearing that!,600,0,0,
 600,0,0,!HasBelt,Get in your|underwear.,Alright.  What do you have in mind?|(She changes in her underwear for you.),0,0,0,"ForceChangeActor(""Underwear"")"
 600,0,0,,Get naked.,Really?  What do you have in mind?|(She strips naked for you.),0,0,0,"ForceChangeActor(""Naked"")"
 600,0,0,,Forget it.,(She nods.),0,0,0,