diff --git a/Actors/Yuki/Clothed_NoBondage_NoGag_Angry.png b/Actors/Yuki/Clothed_NoBondage_NoGag_Angry.png
new file mode 100644
index 0000000000..366bbb636a
Binary files /dev/null and b/Actors/Yuki/Clothed_NoBondage_NoGag_Angry.png differ
diff --git a/Actors/Yuki/Clothed_NoBondage_NoGag_Sleeping.png b/Actors/Yuki/Clothed_NoBondage_NoGag_Sleeping.png
new file mode 100644
index 0000000000..bb2dcdbde9
Binary files /dev/null and b/Actors/Yuki/Clothed_NoBondage_NoGag_Sleeping.png differ
diff --git a/Actors/Yuki/Clothed_NoBondage_NoGag_Sleepy.png b/Actors/Yuki/Clothed_NoBondage_NoGag_Sleepy.png
new file mode 100644
index 0000000000..589c7e2b0d
Binary files /dev/null and b/Actors/Yuki/Clothed_NoBondage_NoGag_Sleepy.png differ
diff --git a/C006_Isolation/Intro/Script.js b/C006_Isolation/Intro/Script.js
index 2ff76723d8..db753ec368 100644
--- a/C006_Isolation/Intro/Script.js
+++ b/C006_Isolation/Intro/Script.js
@@ -9,7 +9,6 @@ function C006_Isolation_Intro_Load() {
 	// Do not allow bondage when we begin
 	Common_BondageAllowed = true;
 	Common_SelfBondageAllowed = true;
-	GameLogSpecificAdd(CurrentChapter, "", "Isolation");
 	
 	// Gets the player crime chapter 2 or 3.  If there's any, we go to chapter 6 instead of 5.
 	if (GameLogQuery("C002_FirstClass", "Mildred", "Subdue") && !GameLogQuery("C002_FirstClass", "Mildred", "Release")) C006_Isolation_Intro_Teacher = "Mildred";
@@ -23,6 +22,8 @@ function C006_Isolation_Intro_Load() {
 		else C006_Isolation_Intro_Teacher = "Yuki";
 	}
 	
+	// Logs the isolation for the teacher
+	GameLogSpecificAdd(CurrentChapter, C006_Isolation_Intro_Teacher, "Isolation");
 
 }
 
diff --git a/C009_Library/Library/Script.js b/C009_Library/Library/Script.js
index 99fcee371a..f08b2a3895 100644
--- a/C009_Library/Library/Script.js
+++ b/C009_Library/Library/Script.js
@@ -60,6 +60,7 @@ function C009_Library_Library_Run() {
 	C009_Library_Library_Navigation("006", "Right", 600, 200);
 	C009_Library_Library_Navigation("006", "Left", 400, 200);
 	C009_Library_Library_Navigation("006", "Down", 500, 400);
+	C009_Library_Library_Navigation("007", "Up", 500, 150);
 	C009_Library_Library_Navigation("007", "Down", 500, 400);
 	C009_Library_Library_Navigation("007", "Right", 800, 200);
 	C009_Library_Library_Navigation("007", "Left", 200, 200);
@@ -139,11 +140,14 @@ function C009_Library_Library_Click() {
 	if (E && (C009_Library_Library_CurrentZone == "006") && (MouseX >= 600) && (MouseX <= 800) && (MouseY >= 200) && (MouseY <= 400) && !C009_Library_Library_JenniferGone) E = C009_Library_Library_LoadJennifer();
 	if (E && (C009_Library_Library_CurrentZone == "006") && (MouseX >= 500) && (MouseX <= 700) && (MouseY >= 400) && (MouseY <= 600)) E = C009_Library_Library_EnterZone("002");
 
-	// In Zone 7, the player can go to zone 4 (down), zone 9 (left) or Yuki (right)
+	// In Zone 7, the player can go to zone 4 (down), zone 9 (left) or Yuki (up)
 	if (E && (C009_Library_Library_CurrentZone == "007") && (MouseX >= 500) && (MouseX <= 700) && (MouseY >= 400) && (MouseY <= 600)) E = C009_Library_Library_EnterZone("004");
-	if (E && (C009_Library_Library_CurrentZone == "007") && (MouseX >= 800) && (MouseX <= 1000) && (MouseY >= 200) && (MouseY <= 400) && (C009_Library_Yuki_CurrentStage < 500)) E = C009_Library_Library_LoadYuki();
-	if (E && (C009_Library_Library_CurrentZone == "007") && (MouseX >= 800) && (MouseX <= 1000) && (MouseY >= 200) && (MouseY <= 400) && (C009_Library_Yuki_CurrentStage >= 500)) E = C009_Library_Library_StartSearch(70);
+	if (E && (C009_Library_Library_CurrentZone == "007") && (MouseX >= 800) && (MouseX <= 1000) && (MouseY >= 200) && (MouseY <= 400)) E = C009_Library_Library_StartSearch(75);
 	if (E && (C009_Library_Library_CurrentZone == "007") && (MouseX >= 200) && (MouseX <= 400) && (MouseY >= 200) && (MouseY <= 400)) E = C009_Library_Library_EnterZone("009");
+	if (E && (C009_Library_Library_CurrentZone == "007") && (MouseX >= 500) && (MouseX <= 700) && (MouseY >= 150) && (MouseY <= 350)) {
+		if ((C009_Library_Yuki_CurrentStage < 500) || (C009_Library_Yuki_CurrentStage == 650)) E = C009_Library_Library_LoadYuki();
+		else E = C009_Library_Library_StartSearch(70);
+	}
 
 	// In Zone 8, the player can go to zone 5 (right) or search the door or on the left
 	if (E && (C009_Library_Library_CurrentZone == "008") && (MouseX >= 800) && (MouseX <= 1000) && (MouseY >= 200) && (MouseY <= 400)) E = C009_Library_Library_EnterZone("005");
diff --git a/C009_Library/Search/75.jpg b/C009_Library/Search/75.jpg
new file mode 100644
index 0000000000..52f15a63be
Binary files /dev/null and b/C009_Library/Search/75.jpg differ
diff --git a/C009_Library/Search/Intro_EN.csv b/C009_Library/Search/Intro_EN.csv
index c45f958688..4b8af4fee9 100644
--- a/C009_Library/Search/Intro_EN.csv
+++ b/C009_Library/Search/Intro_EN.csv
@@ -22,6 +22,7 @@ Stage,LoveReq,SubReq,VarReq,IntroText,Image
 65,0,0,,,60Sit.jpg
 70,0,0,,There's a desk and a purse in|this section of the library.,70.jpg
 71,0,0,,,71.jpg
+75,0,0,,There's not much in this section|of the library but a framed rule.,75.jpg
 80,0,0,,There's a closed wooden door leading|to another section of the library.,80.jpg
 85,0,0,,The bookshelves are filled with books on psychology.|There's a small dark hole in one the shelves.,85.jpg
 86,0,0,,,86.jpg
diff --git a/C009_Library/Search/Script.js b/C009_Library/Search/Script.js
index 6fbdd427b4..2b4853ec89 100644
--- a/C009_Library/Search/Script.js
+++ b/C009_Library/Search/Script.js
@@ -12,6 +12,7 @@ var C009_Library_Search_CanStealEgg = true;
 var C009_Library_Search_CanStealPill = true;
 var C009_Library_Search_CanStealArmbinder = true;
 var C009_Library_Search_CanStealTape = true;
+var C009_Library_Search_CanCheckYuki = true;
 
 // Chapter 9 Library - Search Area Load
 function C009_Library_Search_Load() {
@@ -20,6 +21,7 @@ function C009_Library_Search_Load() {
 	LoadInteractions();
 	if (C009_Library_Search_IntroText != "") OverridenIntroText = C009_Library_Search_IntroText;
 	C009_Library_Search_IntroText = "";
+	C009_Library_Search_CanCheckYuki = (C009_Library_Yuki_CurrentStage == 410);
 	Common_SelfBondageAllowed = false;
 	C009_Library_Search_CanSit = (!Common_PlayerGagged && !Common_PlayerRestrained);
 	C009_Library_Search_CanClimb = (PlayerGetSkillLevel("Sports") >= 1);
@@ -71,12 +73,11 @@ function C009_Library_Search_Masturbate() {
 	} else {
 
 		// Yuki can catch the player masturbating, 1 chance out of 12
-		CurrentTime = CurrentTime + 50000;
 		if (C009_Library_Yuki_CanFindPlayer && (Math.floor(Math.random() * 12) == 0)) {
 			PlayerUngag();
 			if (!C009_Library_Yuki_AllowSecondChance) C009_Library_Yuki_CurrentStage = 290;
 			if (C009_Library_Yuki_CurrentStage < 100) C009_Library_Yuki_CurrentStage = 90;
-			if ((C009_Library_Yuki_CurrentStage >= 100) && (C009_Library_Yuki_CurrentStage < 200)) C009_Library_Yuki_CurrentStage = 190;
+			if ((C009_Library_Yuki_CurrentStage >= 100) && (C009_Library_Yuki_CurrentStage <= 210)) C009_Library_Yuki_CurrentStage = 190;
 			C009_Library_Yuki_AllowSecondChance = false;
 			SetScene(CurrentChapter, "Yuki");
 			LeaveIcon = "";
@@ -163,10 +164,11 @@ function C009_Library_Search_TwoMinutes() {
 		PlayerUngag();
 		if (!C009_Library_Yuki_AllowSecondChance) C009_Library_Yuki_CurrentStage = 280;
 		if (C009_Library_Yuki_CurrentStage < 100) C009_Library_Yuki_CurrentStage = 80;
-		if ((C009_Library_Yuki_CurrentStage >= 100) && (C009_Library_Yuki_CurrentStage < 200)) C009_Library_Yuki_CurrentStage = 180;
+		if ((C009_Library_Yuki_CurrentStage >= 100) && (C009_Library_Yuki_CurrentStage <= 210)) C009_Library_Yuki_CurrentStage = 180;
 		C009_Library_Yuki_AllowSecondChance = false;
 		C009_Library_Library_StuckInHole = false;
 		SetScene(CurrentChapter, "Yuki");
+		if (C009_Library_Yuki_CurrentStage == 280) ActorSetPose("Angry");
 		LeaveIcon = "";
 		GameLogAdd("CaughtInHole");
 	}
@@ -223,4 +225,9 @@ function C009_Library_Search_SearchDesk() {
 		C009_Library_Library_FoundKey = true;
 		OverridenIntroText = GetText("FindKey");
 	}
-}
\ No newline at end of file
+}
+
+// Chapter 9 - Library - The player can check on Yuki if she's sleeping
+function C009_Library_Search_CheckYuki() {
+	SetScene(CurrentChapter, "Yuki");
+}
diff --git a/C009_Library/Search/Stage_EN.csv b/C009_Library/Search/Stage_EN.csv
index 18449cdf7b..c0468c0c98 100644
--- a/C009_Library/Search/Stage_EN.csv
+++ b/C009_Library/Search/Stage_EN.csv
@@ -32,6 +32,7 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 65,0,0,,(Stand up.)|(1 minute),You stand up from the couch.,60,0,0,
 70,0,0,!Common_PlayerRestrained,(Search the desk.)|(1 minute),You search the desk but you|don't find anything interesting.,70,0,0,SearchDesk()
 70,0,0,!Common_PlayerRestrained,(Search the bag.)|(1 minute),You open Teacher Yuki's bag.,71,0,0,
+70,0,0,CanCheckYuki,(Check on Yuki.),,70,0,0,CheckYuki()
 71,0,0,CanStealEgg,(Steal the vibrating egg.),You take the vibrating egg from Yuki's bag.,71,0,0,StealEgg()
 71,0,0,CanStealPill,(Steal the sleeping pill.),You take the sleeping pill from Yuki's bag.,71,0,0,StealPill()
 71,0,0,CanStealArmbinder,(Steal the armbinder.),You take the armbinder from Yuki's bag.,71,0,0,StealArmbinder()
diff --git a/C009_Library/Yuki/Intro_EN.csv b/C009_Library/Yuki/Intro_EN.csv
index b9d2369ca0..bd8b23b587 100644
--- a/C009_Library/Yuki/Intro_EN.csv
+++ b/C009_Library/Yuki/Intro_EN.csv
@@ -1,10 +1,14 @@
 Stage,LoveReq,SubReq,VarReq,IntroText,Image
 0,0,0,,"Good afternoon young lady.  I've never|seen you before, are you a new student?",Library.jpg
-1,0,0,,Please don't make too much noise in the library.,Library.jpg
+1,0,0,,"Welcome to our college, I'm Teacher Yuki.",Library.jpg
+2,0,0,,Please don't make too much noise in the library.,Library.jpg
+5,0,0,,"Young lady, why are you restrained?",Library.jpg
+6,0,0,,,Library.jpg
 10,0,0,,Yummy!  My little pet girl is back.|I hope you remember our deal.,Library.jpg
 20,0,0,,Here you are!  I've been searching for|you for hours.  How did you escape?,Library.jpg
 30,0,0,,"So my ""good for nothing"" pet has came back.|I hope you learned something from isolation.",Library.jpg
 40,0,0,,I hope you learned something from isolation.|Are you now staying away from trouble?,Library.jpg
+41,0,0,,Promise me to be quiet and|not to cause any trouble.,Library.jpg
 50,0,0,,You must be COMMON_PLAYERNAME.|Teacher Mildred told me about you.,Library.jpg
 60,0,0,,"Young lady, I hope you will not fight again and|that you've learned a lesson from your detention.",Library.jpg
 70,0,0,,"Young lady, I hope you will not cause trouble again|and that you've learned a lesson from your detention.",Library.jpg
@@ -19,8 +23,13 @@ Stage,LoveReq,SubReq,VarReq,IntroText,Image
 100,0,0,IsolationEarlyReleaseYuki,Hello again my little pet girl.|Which book are you looking for?,Library.jpg
 110,0,0,,Which book are you looking for?,Library.jpg
 120,0,0,,"Try the literature section.  From the|main aisle, second shelve to your left.",Library.jpg
-180,0,0,,"Young lady, what were you doing in there?",Hole.jpg
-190,0,0,,"Young lady, what were you doing?",Gwendolyne.jpg
+180,0,0,,"(Yuki grabs your legs and pulls you out.)|Young lady, what were you doing in there?",Hole.jpg
+181,0,0,,,Hole.jpg
+182,0,0,,,Hole.jpg
+183,0,0,,,Hole.jpg
+190,0,0,,"(Yuki taps on your shoulder.)|Young lady, what are you doing?",Gwendoline.jpg
+191,0,0,,,Gwendoline.jpg
+192,0,0,,,Gwendoline.jpg
 200,0,0,,Is there anything else you need?,Library.jpg
 200,-3,0,,(She gives you an angry look.)|What do you want now?,Library.jpg
 210,0,0,,So you need my help|to recover your pen?,Library.jpg
@@ -32,13 +41,17 @@ Stage,LoveReq,SubReq,VarReq,IntroText,Image
 260,0,0,,,HoleYuki.jpg
 270,0,0,,,Hole.jpg
 280,0,0,,"Young lady, you promised to be good.|So what were you doing in there?",Hole.jpg
-290,0,0,,"Young lady, you promised to be good.|So tell me what you were doing.",Gwendolyne.jpg
+290,0,0,,"Young lady, you promised to be good.|So tell me what you were doing.",Gwendoline.jpg
+291,0,0,,,Library.jpg
 300,0,0,,,Library.jpg
 310,0,0,,,Library.jpg
 320,0,0,,,DeskFloor.jpg
 330,0,0,,,DeskFloor.jpg
 340,0,0,,,DeskFloorGagged.jpg
-400,0,0,,(Yuki is still sleeping on the floor.),LibraryFloor.jpg
+400,0,0,,,Library.jpg
+410,0,0,,(Yuki is still sleeping on the floor.),LibraryFloor.jpg
+420,0,0,,,Library.jpg
+430,0,0,,,Library.jpg
 500,0,0,,(Yuki is still struggling to get out.),HoleYuki.jpg
 510,0,0,,(Yuki is still struggling to get out.|Her panties are lying on floor.),HoleYukiNoPanties.jpg
 511,0,0,,"(Yuki is still in the hole, dripping and|trembling.  Almost ready to climax.)",HoleYukiNoPanties.jpg
@@ -47,3 +60,7 @@ Stage,LoveReq,SubReq,VarReq,IntroText,Image
 530,0,0,,,Hole.jpg
 600,0,0,,,Library.jpg
 610,0,0,,,Library.jpg
+620,0,0,,,Library.jpg
+630,0,0,,,Library.jpg
+640,0,0,,,Library.jpg
+650,0,0,,(She stares at you and keeps quiet.),Library.jpg
diff --git a/C009_Library/Yuki/Script.js b/C009_Library/Yuki/Script.js
index 4bc59d191f..8af55d6767 100644
--- a/C009_Library/Yuki/Script.js
+++ b/C009_Library/Yuki/Script.js
@@ -20,6 +20,7 @@ var C009_Library_Yuki_MasturbateCount = 0;
 var C009_Library_Yuki_ReleaseConfirm = false;
 var C009_Library_Yuki_SleepingPillFromHole = false;
 var C009_Library_Yuki_CanAskForDoor = false;
+var C009_Library_Yuki_PenAvail = true;
 
 // Chapter 9 Library - Yuki Load
 function C009_Library_Yuki_Load() {
@@ -34,12 +35,12 @@ function C009_Library_Yuki_Load() {
 	else C009_Library_Library_CurrentZone = "007";
 	
 	// A few variables on what already happened
-	C009_Library_Yuki_PenInHole = C009_Library_Search_PenInHole;
+	C009_Library_Yuki_PenInHole = (C009_Library_Search_PenInHole && !GameLogQuery("C009_Library", "Yuki", "StuckInHole") && C009_Library_Yuki_PenAvail);
 	C009_Library_Yuki_BookAlreadyFound = (C009_Library_Library_BookProgress > 40);
 	C009_Library_Yuki_DetentionBondage = GameLogQuery("C001_BeforeClass", "Sidney", "PublicBondage");
 	C009_Library_Yuki_DetentionFighting = (GameLogQuery("C001_BeforeClass", "Sidney", "FightVictory") || GameLogQuery("C001_BeforeClass", "Sidney", "FightDefeat"));
-	C009_Library_Yuki_IsolationMildred = (GameLogQuery("C002_FirstClass", "Mildred", "Subdue") && GameLogQuery("C006_Isolation", "", "Isolation"));
-	C009_Library_Yuki_IsolationYuki = (GameLogQuery("C002_FirstClass", "Yuki", "Drug") && GameLogQuery("C006_Isolation", "", "Isolation"));
+	C009_Library_Yuki_IsolationMildred = GameLogQuery("C006_Isolation", "Mildred", "Isolation");
+	C009_Library_Yuki_IsolationYuki = GameLogQuery("C006_Isolation", "Yuki", "Isolation");
 	C009_Library_Yuki_IsolationPleasureYuki = GameLogQuery("C006_Isolation", "Yuki", "Pleasure");
 	C009_Library_Yuki_IsolationOrgasmYuki = GameLogQuery("C006_Isolation", "Yuki", "Orgasm");
 	C009_Library_Yuki_IsolationEarlyReleaseYuki = (GameLogQuery("C006_Isolation", "", "Release") && C009_Library_Yuki_IsolationYuki);
@@ -47,6 +48,8 @@ function C009_Library_Yuki_Load() {
 	C009_Library_Yuki_HasEgg = ActorHasInventory("VibratingEgg");
 
 	// The first dialog can be different depending on what happened before
+	if (C009_Library_Yuki_CurrentStage == 6) C009_Library_Yuki_CurrentStage = 0;
+	if ((C009_Library_Yuki_CurrentStage == 0) && (Common_PlayerRestrained || Common_PlayerGagged)) C009_Library_Yuki_CurrentStage = 5;
 	if ((C009_Library_Yuki_CurrentStage == 0) && C009_Library_Yuki_IsolationOrgasmYuki && C009_Library_Yuki_IsolationEarlyReleaseYuki) C009_Library_Yuki_CurrentStage = 10;
 	if ((C009_Library_Yuki_CurrentStage == 0) && C009_Library_Yuki_IsolationEscapeYuki) C009_Library_Yuki_CurrentStage = 20;
 	if ((C009_Library_Yuki_CurrentStage == 0) && C009_Library_Yuki_IsolationPleasureYuki && !C009_Library_Yuki_IsolationOrgasmYuki) C009_Library_Yuki_CurrentStage = 30;
@@ -62,7 +65,8 @@ function C009_Library_Yuki_Run() {
 	BuildInteraction(C009_Library_Yuki_CurrentStage);
 	if (C009_Library_Yuki_CurrentStage < 250) DrawInteractionActor();
 	if ((C009_Library_Yuki_CurrentStage >= 270) && (C009_Library_Yuki_CurrentStage < 300)) DrawInteractionActor();
-	if ((C009_Library_Yuki_CurrentStage >= 300) && (C009_Library_Yuki_CurrentStage < 320)) { DrawActor("Yuki", 480, 0, 1); DrawActor("Player", 720, 0, 1); }
+	if ((C009_Library_Yuki_CurrentStage >= 300) && (C009_Library_Yuki_CurrentStage < 320)) { DrawActor("Yuki", 480, 0, 1); DrawActor("Player", 720, 30, 1); }
+	if ((C009_Library_Yuki_CurrentStage >= 400) && (C009_Library_Yuki_CurrentStage < 500)) DrawInteractionActor();
 	if (C009_Library_Yuki_CurrentStage >= 530) DrawInteractionActor();
 }
 
@@ -80,7 +84,7 @@ function C009_Library_Yuki_Click() {
 	}
 	
 	// The player can slide an egg in Yuki if she's stuck in the hole with no panties
-	if ((ClickInv == "VibratingEgg") && !ActorHasInventory("VibratingEgg") && (C009_Library_Yuki_CurrentStage == 510) && !Common_PlayerRestrained) {
+	if ((ClickInv == "VibratingEgg") && !ActorHasInventory("ChastityBelt") && !ActorHasInventory("VibratingEgg") && (C009_Library_Yuki_CurrentStage == 510) && !Common_PlayerRestrained) {
 		OverridenIntroText = GetText("VibratingEggInHole");
 		ActorChangeAttitude(0, 1);
 		PlayerRemoveInventory("VibratingEgg", 1);
@@ -89,7 +93,7 @@ function C009_Library_Yuki_Click() {
 	}
 
 	// The player can slide a sleeping pill in Yuki's anus if she's stuck in the hole with no panties
-	if ((ClickInv == "SleepingPill") && !C009_Library_Yuki_SleepingPillFromHole && (C009_Library_Yuki_CurrentStage == 510) && !Common_PlayerRestrained) {
+	if ((ClickInv == "SleepingPill") && !ActorHasInventory("ChastityBelt") && !C009_Library_Yuki_SleepingPillFromHole && (C009_Library_Yuki_CurrentStage == 510) && !Common_PlayerRestrained) {
 		C009_Library_Yuki_SleepingPillFromHole = true;
 		OverridenIntroText = GetText("SleepingPillInHole");
 		PlayerRemoveInventory("SleepingPill", 1);
@@ -106,6 +110,13 @@ function C009_Library_Yuki_Click() {
 		CurrentTime = CurrentTime + 50000;
 	}
 	
+	// If an item is used while Yuki is sleeping, she will wake up
+	if ((ClickInv != "Player") && (ClickInv != "") && (C009_Library_Yuki_CurrentStage == 410) && !Common_PlayerRestrained) {
+		C009_Library_Yuki_Wake();
+		C009_Library_Yuki_CurrentStage = 420;
+		OverridenIntroText = GetText("ItemWakeUp");
+	}
+	
 }
 
 // Chapter 9 Library - Yuki - When the player leaves to find her book
@@ -138,6 +149,7 @@ function C009_Library_Yuki_AnnoyYuki() {
 	if (C009_Library_Yuki_AnnoyCount >= 3) {
 		if (!C009_Library_Search_CanStealArmbinder && PlayerHasInventory("Armbinder")) PlayerRemoveInventory("Armbinder", 1);
 		PlayerLockInventory("Armbinder");
+		ActorSetPose("Angry");
 		C009_Library_Library_LockedArmbinder = true;
 		OverridenIntroText = GetText("Annoyed");
 		C009_Library_Yuki_CurrentStage = 300;
@@ -160,6 +172,9 @@ function C009_Library_Yuki_StuckInHole() {
 
 // Chapter 9 Library - The player can leave for the regular hole scene
 function C009_Library_Yuki_LeaveForHole() {
+	C009_Library_Yuki_PenInHole = false;
+	C009_Library_Search_PenInHole = false;
+	C009_Library_Yuki_PenAvail = false;
 	C009_Library_Library_CurrentZone = "008";
 	C009_Library_Search_CurrentStage = 85;
 	SetScene(CurrentChapter, "Search");
@@ -215,19 +230,22 @@ function C009_Library_Yuki_ReleaseFromHole() {
 	} else {
 		CurrentTime = CurrentTime + 50000;
 		C009_Library_Yuki_CurrentStage = 530;
+		ActorSetPose("Angry");
 		OverridenIntroText = GetText("ReleaseFromHole");
+		C009_Library_Yuki_CanFindPlayer = true;
 		LeaveIcon = "";
 	}
 }
 
 // Chapter 9 Library - Yuki can fall asleep if she had a sleeping pill
 function C009_Library_Yuki_TestSleep() {
+	C009_Library_Library_CurrentZone = "007";
 	if (C009_Library_Yuki_SleepingPillFromHole) {
 		C009_Library_Yuki_SleepingPillFromHole = false;
 		OverridenIntroText = GetText("DizzySleep");
 		C009_Library_Yuki_CurrentStage = 400;
-		CurrentTime = CurrentTime + 50000;
-		C009_Library_Library_CurrentZone = "007";
+		ActorSetPose("Sleepy");
+		CurrentTime = CurrentTime + 50000;		
 		LeaveIcon = "Leave";
 	}
 }
@@ -236,6 +254,49 @@ function C009_Library_Yuki_TestSleep() {
 function C009_Library_Yuki_RestrainPlayer() {
 	if (!C009_Library_Search_CanStealArmbinder && PlayerHasInventory("Armbinder")) PlayerRemoveInventory("Armbinder", 1);
 	PlayerLockInventory("Armbinder");
+	ActorSetPose("Angry");
 	C009_Library_Library_LockedArmbinder = true;
 	CurrentTime = CurrentTime + 50000;
+}
+
+// Chapter 9 Library - Yuki can free the player before any chat
+function C009_Library_Yuki_TestRelease() {
+	if (ActorGetValue(ActorLove) >= -2) {
+		PlayerReleaseBondage();
+		CurrentTime = CurrentTime + 50000;
+	} else OverridenIntroText = GetText("RefuseHelp");
+}
+
+// Chapter 9 Library - Yuki set a new pose
+function C009_Library_Yuki_SetPose(NewPose) {
+	ActorSetPose("");
+}
+
+// Chapter 9 Library - Yuki set a new pose
+function C009_Library_Yuki_Sleep() {
+	ActorSetPose("Sleeping");
+	LeaveIcon = "Leave";
+	CurrentTime = CurrentTime + 50000;
+	C009_Library_Library_CurrentZone = "007";
+	C009_Library_Yuki_CanFindPlayer = false;
+}
+
+// Chapter 9 Library - When Yuki sleeps, the player can search the room
+function C009_Library_Yuki_StartSearch() {
+	C009_Library_Search_CurrentStage = 70;
+	SetScene(CurrentChapter, "Search");
+}
+
+// Chapter 9 Library - When Yuki is awoken
+function C009_Library_Yuki_Wake() {
+	ActorSetPose("Sleepy");
+	CurrentTime = CurrentTime + 50000;
+	LeaveIcon = "";
+	C009_Library_Yuki_CanFindPlayer = true;
+	C009_Library_Yuki_AllowSecondChance = false;
+}
+
+// Chapter 9 Library - In some intro, Yuki will not allow a second chance
+function C009_Library_Yuki_NoSecondChance() {
+	C009_Library_Yuki_AllowSecondChance = false;
 }
\ No newline at end of file
diff --git a/C009_Library/Yuki/Stage_EN.csv b/C009_Library/Yuki/Stage_EN.csv
index e8443a7049..6d6870f632 100644
--- a/C009_Library/Yuki/Stage_EN.csv
+++ b/C009_Library/Yuki/Stage_EN.csv
@@ -1,10 +1,25 @@
 Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
-0,0,0,,"Yes, it's my|first day here.","Welcome to our college then, I'm Teacher Yuki.|Don't make too much noise in the library.",1,0,0,
-0,0,0,,I'm surprised you|haven't heard of me.,I haven't heard of you.  I'm Teacher Yuki.|Don't make too much noise in the library.,1,0,1,
-0,0,0,,"Yes Miss, a new|school is always scary.","Don't be scared, it will be fine, I'm Teacher Yuki.|Please don't make too much noise in the library.",1,0,-1,
-1,0,0,,(Nod silently.),Excellent.  So are you|looking for a specific book?,100,1,-1,
-1,0,0,,"Yeah, yeah, I know.",(She gives you an angry look.)|Are you looking for a specific book?,100,-1,1,
-1,0,0,,I'll keep quiet.,Very well.  So are you|looking for a specific book?,100,0,0,
+0,0,0,,"Yes, it's my|first day here.","Welcome to our college then, I'm Teacher Yuki.",1,0,0,
+0,0,0,,I'm surprised you|haven't heard of me.,I haven't heard of you.  I'm Teacher Yuki.,1,0,1,
+0,0,0,,"Yes Miss, a new|school is always scary.","Don't be scared, it will be fine, I'm Teacher Yuki.",1,0,-1,
+1,0,0,,It's nice to meet|you Teacher Yuki.,I'm happy to meet you also young lady.|But please be quiet in the library.,2,1,0,
+1,0,0,,Yo Yuki.,"(She frowns.)  It's Teacher Yuki.|Anyway, please be quiet in the library.",2,-1,0,
+1,0,0,!Common_PlayerRestrained,(Shake her hand.),(She shakes your hand with a good grip.)|Now please be quiet in the library.,2,0,0,
+2,0,0,,(Nod silently.),Excellent.  So are you|looking for a specific book?,100,1,-1,
+2,0,0,,"Yeah, yeah, I know.",(She gives you an angry look.)|Are you looking for a specific book?,100,-1,1,
+2,0,0,,I'll keep quiet.,Very well.  So are you|looking for a specific book?,100,0,0,
+5,0,0,Common_PlayerRestrained,(Tug on your restrains.),"Here, let me help you little miss.|(She releases you.)  You may go.",6,0,0,TestRelease()
+5,0,0,Common_PlayerGagged,@Numn ngnnnuh!,"Here, let me help you little miss.|(She releases you.)  You may go.",6,0,0,TestRelease()
+5,0,0,,Can you help|me out Miss?,"Very well, I will help you little miss.|(She releases you.)  You may go now.",6,0,0,TestRelease()
+5,0,0,,Jennifer did|that to me.,I'm very surprised that she would do that.|(She releases you.)  You may go now.,6,0,0,TestRelease()
+6,0,0,,(Nod and walk away.),,6,0,0,PlayerLeaveForBook()
+6,0,0,,Very well Miss.|(Walk away.),,6,0,0,PlayerLeaveForBook()
+40,0,0,,Trouble is my|middle name.,"Young lady, promise me to be quiet and|not cause any trouble in the library.",41,0,1,
+40,0,0,,I'm not causing|any trouble.,"Alright, promise me to be quiet and|not cause any trouble in the library.",41,0,0,
+40,0,0,,"Yes Miss, I'm a|good girl now.","Very good, promise me to be quiet and|not cause any trouble in the library.",41,0,-1,
+41,0,0,,"Ok, I promise.",Very well.  Are you looking for a book?,100,0,0,NoSecondChance()
+41,0,0,,"That's fair, I|promise to be good.",Excellent.  Are you looking for a book?,100,1,0,NoSecondChance()
+41,0,0,,"Yeah, yeah, yeah.|I promise.",Anyway.  Are you looking for a book?,100,-1,0,NoSecondChance()
 50,0,0,,"Good.  Tell her|I said ""hello"".",That's not funny young lady.|Are you looking for a book?,100,-1,1,
 50,0,0,,"Yes, we met before.",That's what I've heard.|Are you looking for a book?,100,0,0,
 50,0,0,,I already have a|reputation then.,Not a very good reputation.|Are you looking for a book?,100,0,1,
@@ -55,6 +70,35 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 120,0,0,,Thank you Miss.|(Walk away.),,200,0,1,PlayerLeaveForBook()
 120,0,0,,Thanks Yuki!|(Walk away.),,200,0,0,PlayerLeaveForBook()
 120,0,0,,(Walk away.),,200,-1,0,PlayerLeaveForBook()
+180,0,0,,I saw something|shiny in there.,You know what killed the cat don't you?|Promise me to never try that again.,181,-1,0,
+180,0,0,,I was looking|for cheese.,And you got yourself in the mouse trap?|Promise me to never try that again.,181,-2,0,
+180,0,0,PenInHole,I dropped my|pen in there.,"Poor young lady, you're so clumsy.|So you need help to recover it?",183,0,-1,
+180,0,0,,A mean girl with black|hair pushed me in.,"Sidney!  (She clenches her fist.)  Young lady,|you will need to learn how to defend yourself.",182,0,-1,
+181,0,0,,Yes Miss.|I promise.,Very good little Miss.  (You walk to her desk.)|I really hope you can stay of out of trouble.,200,1,-1,
+181,0,0,,I won't do it again.,Alright young lady.  (You walk to her desk.)|I really hope you can stay of out of trouble.,200,0,0,
+181,0,0,,"Yeah, yeah, yeah.|I won't do it again.",I don't like your attitude.  (You walk to her desk.)|I really hope you can stay of out of trouble.,200,-1,1,
+181,0,0,,"Yes, that was stupid.|I won't do it again.",Very true young lady.  (You walk to her desk.)|I really hope you can stay of out of trouble.,200,1,0,
+182,0,0,,That's a very|good advice.,Indeed.  (You both walk to her desk.)|I really hope you can stay of out of trouble.,200,1,0,
+182,0,0,,"Don't worry, I'll kick|her ass next time.",Standing your ground should be enough Miss.|(You walk to her desk.)  Stay out of trouble.,200,-1,1,
+182,0,0,,Could you help me|to defend myself?,"Yes, I'll help you later. (You walk to her desk.)|I really hope you can stay of out of trouble.",200,1,-2,
+182,0,0,,"Yeah, I know.",Very well.  (You both walk to her desk.)|I really hope you can stay of out of trouble.,200,0,0,
+183,0,0,,"Yes, can you|retrieve my pen?",I think I can see your pen.|It won't be easy to reach it.,240,0,0,
+183,0,0,,Oh yes Miss.|I cannot do it.,I think I can see your pen.|It won't be easy to reach it.,240,0,-1,
+183,0,0,,"No, I have|another pen.",Alright.  But you could have been hurt.|Promise me to never try that again.,181,0,0,
+190,0,0,,I didn't do anything.,"You little liar, I saw your hand under|your skirt.  What is that magazine?",191,-1,0,
+190,0,0,,I was reading.,I saw your hand under your skirt.|What is that magazine you're reading?,191,0,0,
+190,0,0,,That's none of|your business.,Be polite!  It's absolutely my business.|What is that magazine you're reading?,191,-1,1,
+190,0,0,,(Blush and bow|your head.),You should feel ashamed.|What is that magazine?,191,1,-1,
+190,0,0,,I had an itch.,"You little liar, you were not|scratching.  What is that magazine?",191,-1,0,
+190,0,0,,I'm sorry Miss.|I was masturbating.,"Little miss, you should feel|ashamed.  What is that magazine?",191,1,-2,
+191,0,0,,It's a dirty magazine.,(She nods and confiscates the magazine.)|Promise me you'll never do that again.,192,0,0,NoMoreSweetGwendoline()
+191,0,0,,It's a comic book.,(She grabs and confiscates the magazine.)|Promise me you'll never do that again.,192,-1,0,NoMoreSweetGwendoline()
+191,0,0,,You should know it.|It's Sweet Gwendoline.,(She frowns and confiscates the magazine.)|Promise me you'll never do that again.,192,0,1,NoMoreSweetGwendoline()
+191,0,0,,Please take it.  It|doesn't belong here.,(She smiles and confiscates the magazine.)|Promise me you'll never do that again.,192,1,-1,NoMoreSweetGwendoline()
+192,0,0,,Yes Miss.|I promise.,Very good little Miss.  (You walk to her desk.)|I really hope you can stay of out of trouble.,200,1,-1,
+192,0,0,,I won't do it again.,Alright young lady.  (You walk to her desk.)|I really hope you can stay of out of trouble.,200,0,0,
+192,0,0,,"Yeah, yeah, yeah.|I won't do it again.",I don't like your attitude.  (You walk to her desk.)|I really hope you can stay of out of trouble.,200,-1,1,
+192,0,0,,"Yes, that was stupid.|I won't do it again.",Very true young lady.  (You walk to her desk.)|I really hope you can stay of out of trouble.,200,1,0,
 200,0,0,CanAskForDoor,I've found a|locked door.,"Yes, and you're not allowed|in this section of the library.",200,0,0,
 200,0,0,PenInHole,"Miss, I dropped|my pen in a hole.",Oh!  And you need|my help to recover it?,210,0,0,
 200,0,0,,I'm fine Miss.|(Walk away.),,200,0,0,PlayerLeaveForBook()
@@ -77,6 +121,19 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 260,0,0,,Now we can|have some fun.,What did you say?  Help me out!|(She struggles but cannot get out.),500,-2,1,StuckInHole()
 270,0,0,,Yes.  Thank you.|(Back to library.),,200,0,0,LeaveForHole()
 270,0,0,,Of course Miss Yuki.|(Back to library.),,200,0,-1,LeaveForHole()
+280,0,0,,I saw something|shiny in there.,I don't care.  (She drags you to her|desk in another section of the library.),291,-1,0,
+280,0,0,,I was looking|for cheese.,That's not funny.  (She drags you to her|desk in another section of the library.),291,-2,0,
+280,0,0,PenInHole,I dropped my|pen in there.,I don't care.  (She drags you to her|desk in another section of the library.),291,0,-1,
+280,0,0,,A mean girl with black|hair pushed me in.,I don't care.  (She drags you to her|desk in another section of the library.),291,0,-1,
+290,0,0,,I didn't do anything.,Don't lie.  (She drags you to her|desk in another section of the library.),291,-1,0,
+290,0,0,,I was reading.,Don't lie.  (She drags you to her|desk in another section of the library.),291,0,0,
+290,0,0,,That's none of|your business.,Shut up.  (She drags you to her|desk in another section of the library.),291,-1,1,
+290,0,0,,(Blush and bow|your head.),Come with me.  (She drags you to her|desk in another section of the library.),291,1,-1,
+290,0,0,,I had an itch.,Don't lie.  (She drags you to her|desk in another section of the library.),291,-1,0,
+290,0,0,,I'm sorry Miss.|I was masturbating.,Come with me.  (She drags you to her|desk in another section of the library.),291,1,-2,
+291,0,0,,"Miss, please.|I'm sorry.",It's too late to be sorry little miss.|(She grabs you and straps an armbinder on you.),300,0,-1,RestrainPlayer()
+291,0,0,,So what?,I'll make sure you don't cause any trouble.|(She grabs you and straps an armbinder on you.),300,-1,0,RestrainPlayer()
+291,0,0,,(Stay silent.),"Good, I don't want to hear you anymore.|(She grabs you and straps an armbinder on you.)",300,0,0,RestrainPlayer()
 300,0,0,,Ow!  That hurts!,This should keep you|still until your next class.,310,0,-1,
 300,0,0,,(Struggle fiercely.),You will not escape this armbinder young lady.|I will keep you restrained until your next class.,310,0,1,
 300,0,0,,What is that?,This is a leather armbinder young lady.|I will keep you restrained until your next class.,310,0,0,
@@ -94,7 +151,16 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 340,0,0,,@Mmammih!,(She seems to hear you but|doesn't move or say anything.),340,0,0,TwoMinutes()
 340,0,0,,(Struggle to get out.),(You struggle to get out of the leather|binder but cannot manage to do much.),340,0,0,TwoMinutes()
 340,0,0,,(Wait patiently.),(You wait patiently under the desk.|Time seems to fly very slowly.),340,0,0,TwoMinutes()
-400,0,0,,TO DO SLEEP,TO DO SLEEP,400,0,0,
+400,0,0,,Are you ok Miss?|You look tired.,"(She nods and slowly crumbles|to ground, falling fast asleep.)",410,0,-1,Sleep()
+400,0,0,,(Grab her and|lie her down.),(You grab her and lay her on|the ground where she falls asleep.),410,0,1,Sleep()
+400,0,0,,Are you sleepy?,"(She nods and slowly crumbles|to ground, falling fast asleep.)",410,0,0,Sleep()
+410,0,0,,(Search the room.),,410,0,0,StartSearch()
+410,0,0,!Common_PlayerRestrained,(Wake her up.),(You wake her up and help her to stand.)|What happened here?  Did I fall asleep?,420,0,0,Wake()
+420,0,0,,"Yes, you fell asleep.",That's embarrasing.  (She looks confused.)|Promise not to cause any trouble and you may go.,430,0,0,"SetPose("""")"
+420,0,0,,You were sleeping|on the floor.,That's embarrasing.  (She looks confused.)|Promise not to cause any trouble and you may go.,430,0,0,"SetPose("""")"
+420,0,0,,I drugged you.,WHAT!  (She quickly grabs your arms|and force them in a leather binder.),300,0,0,RestrainPlayer()
+430,0,0,,"I promise, take care.|(Walk away.)",,200,1,0,PlayerLeaveForBook()
+430,0,0,,I won't cause �ny trouble.|(Walk away.),,200,0,0,PlayerLeaveForBook()
 500,0,0,,Struggle for me!,(She struggles madly to get out of|the hole cannot manage to do it.),500,0,0,
 500,0,0,!Common_PlayerRestrained,(Caress her.)|(1 minute),(You caress her legs lovingly and you can|hear faint moans coming from inside.),500,0,0,Caress()
 500,0,0,!Common_PlayerRestrained,(Tickle her.)|(1 minute),(She gets really angry when you tickle|her but cannot stop laughing like a child.),500,0,0,Tickle()
@@ -127,4 +193,11 @@ Stage,LoveReq,SubReq,VarReq,Interaction,Result,NextStage,LoveMod,SubMod,Function
 610,0,0,,No!  I won't!|(Try to resist.),(You try to resist but she forces your|arms back and straps them in an binder.),300,0,1,RestrainPlayer()
 610,0,0,,"Alright, be quick.|(Turn around.)",(You turn around and give her your hands|while she straps them in an armbdiner.),300,0,0,RestrainPlayer()
 610,0,0,,Yes Miss Yuki.|(Turn around.),(You turn around and give her your hands|while she straps them in an armbdiner.),300,0,-1,RestrainPlayer()
-620,0,0,,TO DO TURN TABLES,TO DO TURN TABLES,620,0,0,
+620,0,0,,You would be humiliated|if people knew.,You're not thinking about starting|rumors on what happened are you?,630,0,0,"SetPose("""")"
+620,0,0,,"Everyone will know|what happened, unless... ",Unless what?  You're not thinking|about starting rumors are you?,630,0,0,"SetPose("""")"
+630,0,0,,If you stay good to|me.  I won't talk.,"Fine, we have a deal Miss.|I won't cause you any trouble.",640,0,1,
+630,0,0,,You stay cool.|I stay cool.,"Very well, we have a deal.|I won't cause you any trouble.",640,0,0,
+640,0,0,,"Alright, I'm going now.|(Walk away.)",,650,0,0,PlayerLeaveForBook()
+640,0,0,,I don't want to|see you again.,Fine!  Go away then.,650,-1,0,
+640,0,0,,Very good Yuki.|(Shake her hand.),(You both shake hands with a firm grip.)|You're free to wander young lady.,650,1,0,
+650,0,0,,(Walk away.),,650,0,0,PlayerLeaveForBook()
diff --git a/C009_Library/Yuki/Text_EN.csv b/C009_Library/Yuki/Text_EN.csv
index 1338f073f6..8daa563d61 100644
--- a/C009_Library/Yuki/Text_EN.csv
+++ b/C009_Library/Yuki/Text_EN.csv
@@ -6,4 +6,6 @@ ReleaseFromHole,(You pull her out of the hole and she gives|you a menacing look.
 VibratingEggInHole,(You slide a vibrating egg in her vagina.)|Young lady!  How could you do that?
 SleepingPillInHole,(You slide a sleeping pill in her anus.)|Oh no little miss!  Don't go in there!
 ChastityBeltInHole,(You lock the belt around her waist and crotch.)|What did you just do?  (She struggles fiercely.)
-DizzySleep,"(Yuki sudently feels dizzy, she bends on her|desk and slowly crumbles to the ground sleeping.)"
+DizzySleep,"(Yuki sudently feels dizzy, she|yawns loudly and fights to stay awake.)"
+RefuseHelp,"No, I will not help you.|Go away young lady."
+ItemWakeUp,(You try to use your item but she wakes up.)|What happened here?  Did I fall asleep?