diff --git a/Actors/Amanda/Clothed_NoBondage_NoGag_Hug.png b/Actors/Amanda/Clothed_NoBondage_NoGag_Hug.png
new file mode 100644
index 0000000000..df97350165
Binary files /dev/null and b/Actors/Amanda/Clothed_NoBondage_NoGag_Hug.png differ
diff --git a/Actors/Amanda/Pajamas_NoBondage_Collar_NoGag_Hug.png b/Actors/Amanda/Pajamas_NoBondage_Collar_NoGag_Hug.png
new file mode 100644
index 0000000000..2e7c2d452e
Binary files /dev/null and b/Actors/Amanda/Pajamas_NoBondage_Collar_NoGag_Hug.png differ
diff --git a/Actors/Amanda/Pajamas_NoBondage_NoGag_Hug.png b/Actors/Amanda/Pajamas_NoBondage_NoGag_Hug.png
new file mode 100644
index 0000000000..2f80954e08
Binary files /dev/null and b/Actors/Amanda/Pajamas_NoBondage_NoGag_Hug.png differ
diff --git a/C012_AfterClass/Amanda/AmandaSpankPlayer0.jpg b/C012_AfterClass/Amanda/AmandaSpankPlayer0.jpg
new file mode 100644
index 0000000000..bda339cfe0
Binary files /dev/null and b/C012_AfterClass/Amanda/AmandaSpankPlayer0.jpg differ
diff --git a/C012_AfterClass/Amanda/AmandaSpankPlayer1.jpg b/C012_AfterClass/Amanda/AmandaSpankPlayer1.jpg
new file mode 100644
index 0000000000..6ed6e752d5
Binary files /dev/null and b/C012_AfterClass/Amanda/AmandaSpankPlayer1.jpg differ
diff --git a/C012_AfterClass/Amanda/AmandaSpankPlayerChastity0.jpg b/C012_AfterClass/Amanda/AmandaSpankPlayerChastity0.jpg
new file mode 100644
index 0000000000..e6b6661518
Binary files /dev/null and b/C012_AfterClass/Amanda/AmandaSpankPlayerChastity0.jpg differ
diff --git a/C012_AfterClass/Amanda/AmandaSpankPlayerChastity1.jpg b/C012_AfterClass/Amanda/AmandaSpankPlayerChastity1.jpg
new file mode 100644
index 0000000000..713803d01d
Binary files /dev/null and b/C012_AfterClass/Amanda/AmandaSpankPlayerChastity1.jpg differ
diff --git a/C012_AfterClass/Amanda/AmandaSpankPlayerChastityRedButt0.jpg b/C012_AfterClass/Amanda/AmandaSpankPlayerChastityRedButt0.jpg
new file mode 100644
index 0000000000..f12480810f
Binary files /dev/null and b/C012_AfterClass/Amanda/AmandaSpankPlayerChastityRedButt0.jpg differ
diff --git a/C012_AfterClass/Amanda/AmandaSpankPlayerChastityRedButt1.jpg b/C012_AfterClass/Amanda/AmandaSpankPlayerChastityRedButt1.jpg
new file mode 100644
index 0000000000..2ba7f7e443
Binary files /dev/null and b/C012_AfterClass/Amanda/AmandaSpankPlayerChastityRedButt1.jpg differ
diff --git a/C012_AfterClass/Amanda/AmandaSpankPlayerRedButt0.jpg b/C012_AfterClass/Amanda/AmandaSpankPlayerRedButt0.jpg
new file mode 100644
index 0000000000..497d150c54
Binary files /dev/null and b/C012_AfterClass/Amanda/AmandaSpankPlayerRedButt0.jpg differ
diff --git a/C012_AfterClass/Amanda/AmandaSpankPlayerRedButt1.jpg b/C012_AfterClass/Amanda/AmandaSpankPlayerRedButt1.jpg
new file mode 100644
index 0000000000..d5db3a2eff
Binary files /dev/null and b/C012_AfterClass/Amanda/AmandaSpankPlayerRedButt1.jpg differ
diff --git a/C012_AfterClass/Amanda/Intro_EN.csv b/C012_AfterClass/Amanda/Intro_EN.csv
index 98dc62c10a..4c2c01f387 100644
--- a/C012_AfterClass/Amanda/Intro_EN.csv
+++ b/C012_AfterClass/Amanda/Intro_EN.csv
@@ -135,6 +135,11 @@ Stage,LoveReq,SubReq,VarReq,IntroText,Image
 3160,0,0,HasEgg,What is that pink object in your bag?|Is it the same type of egg you used on me?,Dorm.jpg
 3161,0,0,,,Dorm.jpg
 3162,0,0,,,Dorm.jpg
+3170,0,0,,"My subbie, I want a bondage hug.",Dorm.jpg
+3170,0,0,Common_ActorIsLover,"My love, I want a wonderful and|kinky bondage hug with you.",Dorm.jpg
+3171,0,0,,,Dorm.jpg
+3172,0,0,,,Dorm.jpg
+3173,0,0,,,Dorm.jpg
 3190,0,0,,,Dorm.jpg
 3191,0,0,,,Dorm.jpg
 3200,0,0,,"My subbie, I hope you're ticklish.",Dorm.jpg
@@ -164,9 +169,9 @@ Stage,LoveReq,SubReq,VarReq,IntroText,Image
 3922,0,0,,,Dorm.jpg
 3923,0,0,,,Dorm.jpg
 3930,0,0,,I don't like violence but you|really deserve a good spanking.,Dorm.jpg
-3931,0,0,,,DormBedAmanda.jpg
-3932,0,0,,,DormBedAmanda.jpg
-3933,0,0,,That's enough!  (She helps you to stand up.)|I hope you can learn from this experience.,DormBedAmanda.jpg
+3931,0,0,,,Dorm.jpg
+3932,0,0,,,AmandaSpankPlayer0.jpg
+3933,0,0,,That's enough!  (She helps you to stand up.)|I hope you can learn from this experience.,Dorm.jpg
 3940,0,0,,"You're looking good naked my subbie.|In fact, you will sleep like that tonight.",Dorm.jpg
 3941,0,0,,,Dorm.jpg
 3999,0,0,,,Dorm.jpg
diff --git a/C012_AfterClass/Amanda/Script.js b/C012_AfterClass/Amanda/Script.js
index c00ebe1278..82ca0392b6 100644
--- a/C012_AfterClass/Amanda/Script.js
+++ b/C012_AfterClass/Amanda/Script.js
@@ -72,6 +72,7 @@ function C012_AfterClass_Amanda_Load() {
 	LoadInteractions();
 	ActorLoad("Amanda", "Dorm");
 	Common_PlayerPose = "";
+	if (C012_AfterClass_Amanda_CurrentStage == 3915) Common_PlayerPose = "HogtiePunishment";
 	
 	// Amanda's parameters
 	C012_AfterClass_Amanda_CalcParams();	
@@ -136,7 +137,7 @@ function C012_AfterClass_Amanda_Run() {
 	if (((C012_AfterClass_Amanda_CurrentStage >= 392) && (C012_AfterClass_Amanda_CurrentStage < 400)) || ((C012_AfterClass_Amanda_CurrentStage >= 293) && (C012_AfterClass_Amanda_CurrentStage < 300))) C012_AfterClass_Dorm_DrawOtherActors();
 	
 	// Draw the actor alone or with the player depending on the stage
-	if ((C012_AfterClass_Amanda_CurrentStage != 410) && (C012_AfterClass_Amanda_CurrentStage != 3931) && (C012_AfterClass_Amanda_CurrentStage != 3932) && (C012_AfterClass_Amanda_CurrentStage != 3933) && (C012_AfterClass_Amanda_CurrentStage != 632) && (C012_AfterClass_Amanda_CurrentStage != 633) && (C012_AfterClass_Amanda_CurrentStage != 634) && (C012_AfterClass_Amanda_CurrentStage != 791) && (C012_AfterClass_Amanda_CurrentStage != 194)) {
+	if ((C012_AfterClass_Amanda_CurrentStage != 410) && (C012_AfterClass_Amanda_CurrentStage != 3932) && (C012_AfterClass_Amanda_CurrentStage != 632) && (C012_AfterClass_Amanda_CurrentStage != 633) && (C012_AfterClass_Amanda_CurrentStage != 634) && (C012_AfterClass_Amanda_CurrentStage != 791) && (C012_AfterClass_Amanda_CurrentStage != 194)) {
 		if (((C012_AfterClass_Amanda_CurrentStage >= 3090) && (C012_AfterClass_Amanda_CurrentStage <= 3099)) || ((C012_AfterClass_Amanda_CurrentStage >= 3901) && (C012_AfterClass_Amanda_CurrentStage <= 3999))) {
 			DrawActor("Player", 475, 0, 1);
 			DrawActor(CurrentActor, 750, 0, 1);
@@ -368,13 +369,13 @@ function C012_AfterClass_Amanda_ForceChangePlayer(NewCloth) {
 
 // Chapter 12 After Class - As a Domme, Amanda can force the player into some random bondage
 function C012_AfterClass_Amanda_ForceRandomBondage(BondageType) {
-	if ((BondageType == "Full") || (BondageType == "Gag")) {
+	if ((BondageType == "Full") || (BondageType == "Hug") || (BondageType == "Gag")) {
 		PlayerRandomGag();
-		if (!Common_PlayerGagged) OverridenIntroText = GetText("CantFindRestrain");
+		if (!Common_PlayerGagged && (BondageType == "Gag")) OverridenIntroText = GetText("CantFindRestrain" + (BondageType == "Hug") ? "ForHug" : "");
 	}
-	if ((BondageType == "Full") || (BondageType == "Restrain")) {
+	if ((BondageType == "Full") || (BondageType == "Hug") || (BondageType == "Restrain")) {
 		PlayerRandomRestrain();
-		if (!Common_PlayerRestrained) OverridenIntroText = GetText("CantFindRestrain");
+		if (!Common_PlayerRestrained) OverridenIntroText = GetText("CantFindRestrain" + (BondageType == "Hug") ? "ForHug" : "");
 	}
 	CurrentTime = CurrentTime + 50000;
 }
@@ -937,3 +938,13 @@ function C012_AfterClass_Amanda_TestNaked() {
 		Common_PlayerPose = "BackShy";
 	}
 }
+
+// Chapter 12 After Class - Tests if Amanda will release the player after the bondage hug
+function C012_AfterClass_Amanda_ReleaseAfterBondageHug() {
+	if (EventRandomChance("Love")) {
+		OverridenIntroText = GetText("ReleasePlayerFromBondageHug");
+		PlayerReleaseBondage();
+		CurrentTime = CurrentTime + 50000;
+	}
+	C012_AfterClass_Amanda_AllowLeave();
+}
\ No newline at end of file
diff --git a/C012_AfterClass/Amanda/Stage_EN.csv b/C012_AfterClass/Amanda/Stage_EN.csv
index d1df1be036..5344dc025b 100644
--- a/C012_AfterClass/Amanda/Stage_EN.csv
+++ b/C012_AfterClass/Amanda/Stage_EN.csv
@@ -369,6 +369,27 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 3162,0,0,HasEgg,We are now|egg sisters.,That's kind of funny actually.|(She gets back to her school notes.),3191,-1,0,AllowLeave()
 3162,0,0,,It tickles!,Enjoy the good vibrations my subbie.|(She checks on her school notes again.),3191,0,0,AllowLeave()
 3162,0,0,,(Blush red.),Enjoy the good vibrations my subbie.|(She checks on her school notes again.),3191,0,0,AllowLeave()
+3170,0,0,,It sounds fun Mistress.,(She checks and uses your items on you.)|Wonderful!  Now I want a bondage hug!,3171,0,0,"ForceRandomBondage(""Hug"")"
+3170,0,0,Common_PlayerGagged,(Nod happily.),(She checks and uses your items on you.)|Wonderful!  Now I want a bondage hug!,3171,0,0,"ForceRandomBondage(""Hug"")"
+3170,0,0,,I don't want to do that.,"Ok my subbie, be quiet then.|(She reviews her school notes.)",3191,0,0,TestPunish()
+3170,0,0,Common_PlayerGagged,(Shake your head no.),"Ok my subbie, be quiet then.|(She reviews her school notes.)",3191,0,0,TestPunish()
+3170,0,0,,A bondage hug?,I'll show you.  (She searches and uses|your items on you.)  Now I want a hug!,3171,0,0,"ForceRandomBondage(""Hug"")"
+3171,0,0,!Common_PlayerRestrained,(Open your arms.),(You open your arms and hug your|Mistress closely.)  You're a good subbie.,3172,0,0,"ActorSetPose(""Hug"")"
+3171,0,0,Common_PlayerRestrained,(Get closer for a hug.),(You get closer to your Mistress while she|hugs you tightly.)  You're a wonderful subbie.,3172,1,-1,"ActorSetPose(""Hug"")"
+3171,0,0,Common_PlayerRestrained,(Wait for her.),(Amanda gets close to you and hugs|you tightly.)  You're a sweet subbie.,3172,0,0,"ActorSetPose(""Hug"")"
+3171,0,0,!Common_PlayerRestrained,Of course Mistress.,(You open your arms and hug your|Mistress closely.)  You're a good subbie.,3172,0,0,"ActorSetPose(""Hug"")"
+3171,0,0,Common_PlayerRestrained,Of course Mistress.,(You get closer to your Mistress while she|hugs you tightly.)  You're a wonderful subbie.,3172,1,-1,"ActorSetPose(""Hug"")"
+3172,0,0,,It's wonderful Mistress.,(She smiles and releases you.)|That was a nice hug my subbie.,3173,0,0,"ActorSetPose(""Happy"")"
+3172,0,0,,You're so kinky Amanda.,(She frowns and releases you.)|Call me Mistress my subbie.,3173,-1,1,"ActorSetPose("""")"
+3172,0,0,,(Hug her close.),(She smiles and releases you.)|That was a nice hug my subbie.,3173,0,0,"ActorSetPose(""Happy"")"
+3172,0,0,,(Try to escape|from the hug.),(She frowns and releases you.)|Don't struggle like that girl.,3173,-1,1,"ActorSetPose("""")"
+3173,0,0,Common_PlayerRestrained,Will you help me?,"No, I kind of like you like that.|(She checks on her notes again.)",3191,0,0,ReleaseAfterBondageHug()
+3173,0,0,Common_PlayerRestrained,(Struggle in|your restrains.),"Struggle some more, I like it.|(She checks on her notes again.)",3191,0,0,ReleaseAfterBondageHug()
+3173,0,0,Common_PlayerGagged,@Uuuugnm uph!,I love it when you try to talk.|(She checks on her notes again.),3191,0,0,ReleaseAfterBondageHug()
+3173,0,0,Common_PlayerRestrained,Will you leave me|restrained like that?,"Of course, since you seem to enjoy it.|(She checks on her school notes again.)",3191,0,0,AllowLeave()
+3173,0,0,Common_PlayerRestrained,(Struggle playfully.),"Struggle some more, I like it.|(She checks on her notes again.)",3191,0,0,AllowLeave()
+3173,0,0,!Common_PlayerRestrained,What else|could we do?,We'll play again later my subbie.|(She checks on her notes again.),3191,0,0,AllowLeave()
+3173,0,0,!Common_PlayerRestrained,Let's do this|more often.,"Absolutely, next time with better restrains.|(She checks on her school notes again.)",3191,0,0,AllowLeave()
 3190,0,0,!Common_PlayerRestrained,I'm sorry you didn't|found anything you like.,"No worries, tomorrow we'll do some shopping.|(She gets back to reviewing her school notes.)",3191,0,0,AllowLeave()
 3190,0,0,Common_PlayerRestrained,Do you like to|see me restrained?,"Absolutely, you look adorable my subbie.|(She gets back to her school notes and reads them.)",3191,0,0,AllowLeave()
 3190,0,0,Common_PlayerGagged,@Niighn mhim!,It's wonderful to have a submissive like you.|(She gets back to her school notes and reads them.),3191,0,0,AllowLeave()
@@ -489,14 +510,14 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 3923,0,0,,It needs to|be so tight?,Absolutely.  And it could be even tighter.|(She smiles and gets back to her notes.),3999,0,0,"EndPunishment(""Belted"")"
 3923,0,0,,This is so kinky!,It's your belt after all.|(She gets back to her notes.),3999,0,0,"EndPunishment(""Belted"")"
 3923,0,0,,(Bow your head.),It's your belt after all.|(She gets back to her notes.),3999,0,0,"EndPunishment(""Belted"")"
-3930,0,0,,Please don't spank me.|I'll be a good girl.,"Of course you will, but for now|you will bend down facing that chair.",3931,0,0,
-3930,0,0,,Please don't hurt|me too much.,"You will be fine, don't worry.|Bend down facing that chair.",3931,0,-1,
-3930,0,0,,Forget it Amanda.,Do not defy me my subbie.|Bend down facing that chair.,3931,0,1,
-3930,0,0,,(Nod slowly.),"You will be fine, don't worry.|Bend down facing that chair.",3931,0,0,
-3930,0,0,Common_ActorIsLover,Yes my love.,You will be fine my love.|Bend down facing that chair.,3931,1,0,
-3931,0,0,,(Stay silent and bend|in front of the chair.),,3932,0,0,AmandaSpankPlayer()
-3931,0,0,,Fuck that shit!|(Bend facing the chair.),,3932,-1,0,AmandaSpankPlayer()
-3931,0,0,,Yes Mistress.|(Bend facing the chair.),,3932,0,0,AmandaSpankPlayer()
+3930,0,0,,Please don't spank me.|I'll be a good girl.,"Of course you will, but for now|you will bend down facing your desk.",3931,0,0,
+3930,0,0,,Please don't hurt|me too much.,"You will be fine, don't worry.|Bend down facing your desk.",3931,0,-1,
+3930,0,0,,Forget it Amanda.,Do not defy me my subbie.|Bend down facing your desk.,3931,0,1,
+3930,0,0,,(Nod slowly.),"You will be fine, don't worry.|Bend down facing your desk.",3931,0,0,
+3930,0,0,Common_ActorIsLover,Yes my love.,You will be fine my love.|Bend down facing your desk.,3931,1,0,
+3931,0,0,,(Stay silent and bend|in front of the desk.),,3932,0,0,AmandaSpankPlayer()
+3931,0,0,,Fuck that shit!|(Bend facing the desk.),,3932,-1,0,AmandaSpankPlayer()
+3931,0,0,,Yes Mistress.|(Bend facing the desk.),,3932,0,0,AmandaSpankPlayer()
 3932,0,0,,Ow!,,3932,0,0,AmandaSpankPlayer()
 3932,0,0,,(Stay silent.),,3932,0,0,AmandaSpankPlayer()
 3932,0,0,,It hurts!,,3932,0,0,AmandaSpankPlayer()
diff --git a/C012_AfterClass/Amanda/Text_EN.csv b/C012_AfterClass/Amanda/Text_EN.csv
index 769b6ec1f9..dabf792b62 100644
--- a/C012_AfterClass/Amanda/Text_EN.csv
+++ b/C012_AfterClass/Amanda/Text_EN.csv
@@ -11,6 +11,7 @@ EventRelease,3130
 EventConfiscateKeys,3140
 EventConfiscateCrop,3150
 EventVibratingEgg,3160
+EventBondageHug,3170
 EventTickle,3200
 EventMasturbate,3220
 PunishmentGrounded,3910
@@ -33,6 +34,7 @@ PlayerUnrestrainFirst,It's possible with training and discipline.|But first you
 GetOnYourKnees,"Very well, I could take you as my submissive.|First, you will need to get on your knees."
 ReleasePlayer,"Here, let me help you.|(She releases you.)"
 ReleasePlayerGagged,Oohogm nagn momp.|(She releases you.)
+ReleasePlayerFromBondageHug,(She nods.)  Let me help you my submissive.|(She releases you and gets back to her notes.)
 CannotReleasePlayer,(She struggles in her|restrains and shrugs.)
 ActivityEndGood,Enough of that.  It was wonderful.|Understand that I can do it any time.
 ActivityEndFair,Enough of that.  It was kind of fun.|Understand that I can do it any time.
@@ -45,18 +47,19 @@ PunishSinceNaked,"Since you're already naked,|your punishment can begin."
 StillGrounded,"(Amanda ignores you and reviews her notes.|You need to wait, you're still grounded.)"
 StillGroundedByOther,"Sorry, I cannot help you.  Rules are rules.|(You need to wait, you're still grounded.)"
 CantFindRestrain,(She checks your items but doesn't seem|to find what she wants.)  Too bad my subbie.
-SpankPlayer1,(You lie on her knees and she swiftly|spanks your butt by surprise.)  One!
-SpankPlayer2,(She raises her hand quickly and spanks|another one on the same spot.)  Two!
-SpankPlayer3,(She raises her arm pretty high and drops|a strong one that hurts really badly.)  Three!
-SpankPlayer4,"(She spanks you from the flip side,|hitting a fresh part of your butt.)  Four!"
-SpankPlayer5,"(She takes a huge swing, spanking you|hard and turning your butt red.)  Five!"
-SpankPlayer6,"(She goes for the flip side again, hitting|hard on the previous area.)  Six!"
-SpankPlayer7,"(She swings a really quick one, hitting you by|surprise and making you scream.)  Seven!"
-SpankPlayer8,(She caresses your butt and takes her time|before spanking a strong one.)  Eight!
-SpankPlayer9,"(She goes for the flip side again, hitting|really hard on the previous area.)  Nine!"
-SpankPlayer10,"(She checks your red butt and smiles,|hitting on the worst spot.)  Ten!"
-SpankPlayer11,(She gropes your butt slowly and quickly|releases it to spank you.)  Eleven!
-SpankPlayer12,"(She takes a deep breath and spanks a really|hard one, making you cry.)  Twelve!"
+CantFindRestrainForHug,(She searches in your items and gives up.)|I won't restrain you but I will still hug you.
+SpankPlayer1,(You bend in front of the desk while she|spanks you lightly.)  Be strong my subbie.
+SpankPlayer2,(She raises her hand and spanks you down on|another spot.)  This is for your own good.
+SpankPlayer3,(She raises her arm pretty high and drops|a strong one that hurts pretty bad.)  Endure.
+SpankPlayer4,"(She spanks you from the flip side, hitting|a fresh part of your butt.)  I care for you."
+SpankPlayer5,(She takes her hardest swing yet.  Spanking|you strongly and turning your butt red.)
+SpankPlayer6,"(She goes for the flip side again, hitting|pretty bad on the previous area.)  Learn discipline."
+SpankPlayer7,"(She swings a really quick one, hitting you by|surprise and making you yell.)  Learn obedience."
+SpankPlayer8,(She caresses your butt and takes her time|before spanking a strong one.)  I'm proud of you.
+SpankPlayer9,"(She goes for the flip side again, hitting|really hard on the previous area.)  Learn your rank."
+SpankPlayer10,"(She checks your red butt and smiles, hitting|again on the worst spot.)  Learn to follow rules."
+SpankPlayer11,(She caresses your butt and quickly|release it to spank you hard.)  Stay strong.
+SpankPlayer12,"(She takes a deep breath and spanks a really|hard one, making you cry.)  Good girl."
 Crop,(You whip her on the butt with your crop.)|My!  It really hurts.  Please don't do that.
 CropFromMistress,(You whip her on the butt with your crop.)|Mistress.  It really hurts.  (She whimpers.)
 CropWhileGagged,(You whip her on the butt with your crop|while she whimpers and cries a little.)
diff --git a/C012_AfterClass/Sidney/Script.js b/C012_AfterClass/Sidney/Script.js
index 0d6181a516..d91429f9c3 100644
--- a/C012_AfterClass/Sidney/Script.js
+++ b/C012_AfterClass/Sidney/Script.js
@@ -70,6 +70,7 @@ function C012_AfterClass_Sidney_Load() {
 	LoadInteractions();
 	ActorLoad("Sidney", "Dorm");
 	Common_PlayerPose = "";
+	if (C012_AfterClass_Sidney_CurrentStage == 3915) Common_PlayerPose = "TwoRopesPunishment";
 	
 	// At stage 400, Sidney is leaving
 	if (C012_AfterClass_Sidney_CurrentStage == 400) { ActorUngag(); LeaveIcon = ""; }
@@ -377,7 +378,7 @@ function C012_AfterClass_Sidney_ForceChangePlayer(NewCloth) {
 function C012_AfterClass_Sidney_ForceRandomBondage(BondageType) {
 	if ((BondageType == "Full") || (BondageType == "Gag")) {
 		PlayerRandomGag();
-		if (!Common_PlayerGagged) OverridenIntroText = GetText("CantFindRestrain");
+		if (!Common_PlayerGagged && (BondageType == "Gag")) OverridenIntroText = GetText("CantFindRestrain");
 	}
 	if ((BondageType == "Full") || (BondageType == "Restrain")) {
 		PlayerRandomRestrain();
diff --git a/C999_Common/ChastityBelt/Script.js b/C999_Common/ChastityBelt/Script.js
index 030d2eb08c..146af3a6a1 100644
--- a/C999_Common/ChastityBelt/Script.js
+++ b/C999_Common/ChastityBelt/Script.js
@@ -41,6 +41,7 @@ function C999_Common_ChastityBelt_LockSelf() {
 		} else {
 			PlayerRemoveInventory("ChastityBelt", 1);
 			PlayerLockInventory("ChastityBelt");
+			if ((Common_PlayerCostume == "WhiteLingerie") || (Common_PlayerCostume == "RedBikini")) PlayerClothes("Naked");
 			C999_Common_ChastityBelt_HasLooseBelt = PlayerHasInventory("ChastityBelt");
 			C999_Common_ChastityBelt_CurrentStage = 10;
 		}
diff --git a/Event.js b/Event.js
index 7de94b252f..631010c7bc 100644
--- a/Event.js
+++ b/Event.js
@@ -2,7 +2,7 @@ var EventLastRandomType = "";
 var EventActivityCurrent = "";
 var EventActivityCount = 0;
 var EventActivityMaxCount = 0;
-var EventList = ["Naked", "Underwear", "SchoolUniform", "RedBikini", "BlackDress", "WhiteLingerie", "FullBondage", "Restrain", "Gag", "Release", "ConfiscateKeys", "ConfiscateCrop", "VibratingEgg", "Tickle", "Slap", "Masturbate", "Crop"];
+var EventList = ["Naked", "Underwear", "SchoolUniform", "RedBikini", "BlackDress", "WhiteLingerie", "FullBondage", "BondageHug", "Restrain", "Gag", "Release", "ConfiscateKeys", "ConfiscateCrop", "VibratingEgg", "Tickle", "Slap", "Masturbate", "Crop"];
 var EventPunishmentList = ["Grounded", "Belted", "Spanked", "SleepBoundAndGagged"];
 
 // Returns TRUE if the event is accepted
@@ -83,6 +83,7 @@ function EventRandomPlayerSubmissive() {
 			if ((EventType == "SchoolUniform") && !Common_PlayerRestrained && (!Common_PlayerClothed || (Common_PlayerCostume != ""))) Result = EventPlayerSubmissive(EventStage);
 			if ((EventType == "RedBikini") && !Common_PlayerRestrained && (Common_PlayerCostume != "RedBikini") && !Common_PlayerChaste) Result = EventPlayerSubmissive(EventStage);
 			if ((EventType == "WhiteLingerie") && !Common_PlayerRestrained && (Common_PlayerCostume != "WhiteLingerie") && !Common_PlayerChaste) Result = EventPlayerSubmissive(EventStage);
+			if ((EventType == "BlackDress") && !Common_PlayerRestrained && (Common_PlayerCostume != "BlackDress")) Result = EventPlayerSubmissive(EventStage);
 			if ((EventType == "FullBondage") && !Common_PlayerRestrained && !Common_PlayerGagged) Result = EventPlayerSubmissive(EventStage);
 			if ((EventType == "Restrain") && !Common_PlayerRestrained) Result = EventPlayerSubmissive(EventStage);
 			if ((EventType == "Gag") && !Common_PlayerGagged) Result = EventPlayerSubmissive(EventStage);
@@ -90,8 +91,9 @@ function EventRandomPlayerSubmissive() {
 			if ((EventType == "VibratingEgg") && PlayerHasInventory("VibratingEgg") && !PlayerHasLockedInventory("VibratingEgg") && !Common_PlayerChaste) Result = EventPlayerSubmissive(EventStage);
 			if ((EventType == "ConfiscateKeys") && PlayerHasInventory("CuffsKey")) Result = EventPlayerSubmissive(EventStage);
 			if ((EventType == "ConfiscateCrop") && PlayerHasInventory("Crop")) Result = EventPlayerSubmissive(EventStage);
-			if ((EventType == "Tickle") && (ActorGetValue(ActorLove) >= -5)) Result = EventPlayerSubmissive(EventStage);
-			if ((EventType == "Slap") && (ActorGetValue(ActorLove) <= 5)) Result = EventPlayerSubmissive(EventStage);
+			if (EventType == "BondageHug") Result = EventPlayerSubmissive(EventStage);
+			if (EventType == "Tickle") Result = EventPlayerSubmissive(EventStage);
+			if (EventType == "Slap") Result = EventPlayerSubmissive(EventStage);
 			if ((EventType == "Masturbate") && !Common_PlayerChaste && !GameLogQuery(CurrentChapter, "Player", "NextPossibleOrgasm")) Result = EventPlayerSubmissive(EventStage);
 			if ((EventType == "Crop") && (PlayerHasInventory("Crop") || GameLogQuery("", Common_PlayerOwner, "HasCrop"))) Result = EventPlayerSubmissive(EventStage);