diff --git a/src/pregmod/incubator.tw b/src/pregmod/incubator.tw
index 774b41d0e016520706e88e2ca35c9799eece446e..efc2b24ecb471eb2a14567f755c408c7976abcd4 100644
--- a/src/pregmod/incubator.tw
+++ b/src/pregmod/incubator.tw
@@ -494,7 +494,8 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
 				ovaries: 0,
 				penis: 0,
 				testicles:0,
-				eyes: 0,
+				rightEye: 0,
+				leftEye: 0,
 				voiceBox: 0}>>
 			<<for _i = 0; _i < $incubatorOrgans.length; _i++>>
 				<<if $tanks[$i].ID == $incubatorOrgans[_i].ID>>
@@ -507,9 +508,12 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
 					<<if $incubatorOrgans[_i].type == "penis">>
 						<<set $tankOrgans.penis = 1>>
 					<</if>>
-					<<if $incubatorOrgans[_i].type == "eyes">>
-						<<set $tankOrgans.eyes = 1>>
+					<<if $incubatorOrgans[_i].type == "rightEye">>
+						<<set $tankOrgans.rightEye = 1>>
 					<</if>>
+					<<if $incubatorOrgans[_i].type == "leftEye">>
+						<<set $tankOrgans.leftEye = 1>>
+					<</if>>					
 					<<if $incubatorOrgans[_i].type == "voicebox">>
 						<<set $tankOrgans.voicebox = 1>>
 					<</if>>
@@ -540,12 +544,33 @@ Target age for release: <<textbox "$targetAge" $targetAge "Incubator">> [[Minimu
 					<<goto "Incubator">>
 				<</link>>
 			<</if>>
-			<<if getBestVision($tanks[$i]) === 0 && $tankOrgans.eyes != 1>>
-				<br>$He appears to be blind:
-				<<link "Prepare eyes">>
-					<<run App.Medicine.OrganFarm.growIncubatorOrgan($tanks[$i], "rightEye"), App.Medicine.OrganFarm.growIncubatorOrgan($tanks[$i], "leftEye")>>
+			<<if getLeftEyeVision($tanks[$i]) === 0 && $tankOrgans.leftEye != 1>>
+				<br>$He appears to be blind in $his left eye:
+				<<link "Prepare left eye">>
+					<<run App.Medicine.OrganFarm.growIncubatorOrgan($tanks[$i], "leftEye")>>
 					<<goto "Incubator">>
 				<</link>>
+				<<if getRightEyeVision($tanks[$i]) === 0 && $tankOrgans.rightEye != 1>>
+					|
+					<<link "Prepare both eyes">>
+						<<run App.Medicine.OrganFarm.growIncubatorOrgan($tanks[$i], "leftEye"), App.Medicine.OrganFarm.growIncubatorOrgan($tanks[$i], "rightEye")>>
+						<<goto "Incubator">>
+					<</link>>
+				<</if>>
+			<</if>>
+			<<if getRightEyeVision($tanks[$i]) === 0 && $tankOrgans.rightEye != 1>>
+				<br>$He appears to be blind in $his right eye:
+				<<link "Prepare right eye">>
+					<<run App.Medicine.OrganFarm.growIncubatorOrgan($tanks[$i], "rightEye")>>
+					<<goto "Incubator">>
+				<</link>>
+				<<if getLeftEyeVision($tanks[$i]) === 0 && $tankOrgans.leftEye != 1>>
+					|
+					<<link "Prepare both eyes">>
+						<<run App.Medicine.OrganFarm.growIncubatorOrgan($tanks[$i], "leftEye"), App.Medicine.OrganFarm.growIncubatorOrgan($tanks[$i], "rightEye")>>
+						<<goto "Incubator">>
+					<</link>>
+				<</if>>				
 			<</if>>
 			<<if $tanks[$i].voice == 0 && $tankOrgans.voicebox != 1>>
 				<br>$He appears to be mute: