diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 9a1c9a998ee71b2ddd25be8498684fb2f2cb7896..1162f57c1e399da1f5d83cff0111bcf20689a1ce 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -172,29 +172,6 @@ globalThis.newSlave = function(slave) {
 		}
 	}
 
-	if (slave.dick > 0 &&
-		slave.balls > 0 &&
-		slave.devotion <= 50 &&
-		(slave.fetish !== "buttslut" || slave.fetishKnown !== 1) &&
-		slave.sexualFlaw !== "hates women") {
-		V.REFeminizationCheckinIDs.push(slave.ID);
-	}
-	if (slave.actualAge > 35 && slave.face <= 10 && slave.faceImplant === 0 && slave.energy <= 60) {
-		V.REMILFCheckinIDs.push(slave.ID);
-	}
-	if (slave.attrXY <= 35 && slave.attrXX > 65) {
-		V.REOrientationCheckinIDs.push(slave.ID);
-	}
-	if (slave.face < -10) {
-		V.REUglyCheckinIDs.push(slave.ID);
-	}
-	if (slave.anus < 2) {
-		V.REButtholeCheckinIDs.push(slave.ID);
-	}
-	if (slave.boobs < 800) {
-		V.REReductionCheckinIDs.push(slave.ID);
-	}
-
 	if (slave.genes === "XX") {
 		if (slave.pubertyXX === 1) {
 			if (slave.pubertyXY === 1) {
@@ -225,6 +202,32 @@ globalThis.newSlave = function(slave) {
 		}
 	}
 
+	if (slave.dick > 0 &&
+		slave.balls > 0 &&
+		slave.vagina < 0 &&
+		slave.anus === 0 &&
+		slave.genes === "XY" &&
+		slave.faceShape === "masculine" &&
+		slave.attrXY <= 35 &&
+		slave.hormoneBalance < 0 {
+		V.REFeminizationCheckinIDs.push(slave.ID);
+	}
+	if (slave.actualAge > 35 && slave.face <= 10 && slave.faceImplant === 0 && slave.energy <= 60) {
+		V.REMILFCheckinIDs.push(slave.ID);
+	}
+	if (slave.attrXY <= 35 && slave.attrXX > 65) {
+		V.REOrientationCheckinIDs.push(slave.ID);
+	}
+	if (slave.face < -10) {
+		V.REUglyCheckinIDs.push(slave.ID);
+	}
+	if (slave.anus < 2) {
+		V.REButtholeCheckinIDs.push(slave.ID);
+	}
+	if (slave.boobs < 800) {
+		V.REReductionCheckinIDs.push(slave.ID);
+	}
+
 	generatePronouns(slave);
 	SetBellySize(slave);
 	addSlave(slave);
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index 88a48ef5e84ef45824e61bd536465e111c243957..19e4a4df28d7e95e324cc8cbd4a2a5e6b693f882 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -230,10 +230,18 @@
 
 <<if (_OldHG != -1) && (_NewHG != -1)>>
 	<<set _oldTimeInGrade = $HGTimeInGrade>> /* preserve time in grade during HG swaps */
+	<<if $personalAttention == "HG">>
+		/* keep removeJob from clearing PC HG supporting. */
+		<<set _keepHelpingHG = 1>>
+	<</if>>
+	<<set _keepHelpingHG = 0>>
 	<<= removeJob($slaves[_NewHG], "live with your Head Girl")>>
 	<<= assignJob($slaves[_OldHG], "live with your Head Girl")>>
 	<<= assignJob($slaves[_NewHG], "be your Head Girl")>>
 	<<set $slaves[_NewHG].diet = "healthy", $HGTimeInGrade = _oldTimeInGrade>>
+	<<if _keepHelpingHG>>
+		<<set $personalAttention = "HG">>
+	<</if>>
 <</if>>
 
 <<if WombBirthReady($PC, 38) > 0 && random(1,100) > 50>>