diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw
index 525cdb4abe18de99f4c9d496d84b5d941c832cba..f700ecb2f85c46fb96474f2fcda0b13736578c03 100644
--- a/src/uncategorized/remoteSurgery.tw
+++ b/src/uncategorized/remoteSurgery.tw
@@ -148,14 +148,14 @@ $His $activeSlave.faceShape face is
 
 <<if ($seeExtreme == 1)>>
 	<<if $activeSlave.indentureRestrictions < 1>>
-		<<if $activeSlave.eyesImplant == 0>>
-			<<if ($activeSlave.eyes > -2)>>
+		<<if hasAnyNaturalEyes($activeSlave)>>
+			<<if (canSee($activeSlave))>>
 				| [[Blind|Surgery Degradation][$activeSlave.eyes = -2,$activeSlave.eyeColor = "dulled " + $activeSlave.origEye,$activeSlave.eyeColor = $activeSlave.origEye,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "blind"]]
 			<</if>>
-			<<if ($activeSlave.eyes > -3)>>
-				| [[Remove eyes|Surgery Degradation][cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "remove eyes"]]
+			<<if (hasAnyEyes($activeSlave))>>
+				| [[Remove eyes|Surgery Degradation][cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "remove eyes", surgeryAmp($activeSlave, "right eye"), surgeryAmp($activeSlave, "left eye")]]
 				/* eyes are set in Surgery Degradation */
-				<<if ($activeSlave.eyes > -2)>>//This will greatly restrict $him//<</if>>
+				<<if (canSee($activeSlave))>>//This will greatly restrict $him//<</if>>
 			<</if>>
 			<<if isProstheticAvailable($activeSlave, "ocular")>>
 				| [["Give " + $him + " ocular implants"|Surgery Degradation][$activeSlave.eyesImplant = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "ocular implant"]]