diff --git a/GameData/RP-1/Contracts/Lunar Surface Probes/MoonOrbiter.cfg b/GameData/RP-1/Contracts/Lunar Surface Probes/MoonOrbiter.cfg
index 42753826c23..3b56a573554 100644
--- a/GameData/RP-1/Contracts/Lunar Surface Probes/MoonOrbiter.cfg	
+++ b/GameData/RP-1/Contracts/Lunar Surface Probes/MoonOrbiter.cfg	
@@ -65,14 +65,9 @@ CONTRACT_TYPE
 		name = IncrementTheCount
 		type = Expression
 		
-		CONTRACT_OFFERED
-		{
-			LunarOrbiter_Completion = ($LunarOrbiter_Completion + 0) == 0 ? (UniversalTime() - 60 * 86400) : ($LunarOrbiter_Completion + 0)
-		}
 		CONTRACT_COMPLETED_SUCCESS
 		{
 			LunarOrbiter_Count = $LunarOrbiter_Count + 1
-			LunarOrbiter_Completion = UniversalTime()
 		}
 	}
 
@@ -105,14 +100,13 @@ CONTRACT_TYPE
 		PARAMETER
 		{
 			name = Visible Imager
-			type = PartValidation
-			part = RO-BasicTVCamera
-			part = RO-ImprovedTVCamera
-			part = RO-AdvancedImager
-			part = RO-HIRES
-			minCount = 1
-			title = Have at least 1 Visible Imaging Device of Level 2 or higher
-			hideChildren = true
+			type = RP1CollectScience
+			targetBody = Moon
+			experiment = RP0visibleImaging2
+			situation = InSpaceLow
+			fractionComplete = 1
+			minSubjectsToComplete = 1
+			title = Have at least 1 Visible Imaging Device of Level 2 or higher & collect science in at least 1 biome
 		}
 		
 		PARAMETER
@@ -137,16 +131,5 @@ CONTRACT_TYPE
 				completionText = Stable Orbit: Confirmed
 			}
 		}
-		
-		PARAMETER
-		{
-			name = CollectScience
-			type = CollectScience
-			targetBody = Moon
-			recoveryMethod = RecoverOrTransmit
-			experiment = RP0visibleImaging2
-			title = Collect Science from around the Moon and transmit it to the KSC
-			hideChildren = true
-		}
 	}
 }
diff --git a/GameData/RP-1/Contracts/Lunar Surface Probes/MoonOrbiterOptional.cfg b/GameData/RP-1/Contracts/Lunar Surface Probes/MoonOrbiterOptional.cfg
index 6d26bc433a0..7aebaac49e8 100644
--- a/GameData/RP-1/Contracts/Lunar Surface Probes/MoonOrbiterOptional.cfg	
+++ b/GameData/RP-1/Contracts/Lunar Surface Probes/MoonOrbiterOptional.cfg	
@@ -72,7 +72,7 @@ CONTRACT_TYPE
 	{
 		name = IncrementTheCount
 		type = Expression
-		
+
 		CONTRACT_COMPLETED_SUCCESS
 		{
 			LunarOrbiterOptional_Count = $LunarOrbiterOptional_Count + 1
@@ -108,14 +108,13 @@ CONTRACT_TYPE
 		PARAMETER
 		{
 			name = Visible Imager
-			type = PartValidation
-			part = RO-BasicTVCamera
-			part = RO-ImprovedTVCamera
-			part = RO-AdvancedImager
-			part = RO-HIRES
-			minCount = 1
-			title = Have at least 1 Visible Imaging Device of Level 2 or higher
-			hideChildren = true
+			type = RP1CollectScience
+			targetBody = Moon
+			experiment = RP0visibleImaging2
+			situation = InSpaceLow
+			fractionComplete = 1
+			minSubjectsToComplete = 1
+			title = Have at least 1 Visible Imaging Device of Level 2 or higher & collect science in at least 1 biome
 		}
 		
 		PARAMETER
@@ -140,16 +139,5 @@ CONTRACT_TYPE
 				completionText = Stable Orbit: Confirmed
 			}
 		}
-		
-		PARAMETER
-		{
-			name = CollectScience
-			type = CollectScience
-			targetBody = Moon
-			recoveryMethod = RecoverOrTransmit
-			experiment = RP0visibleImaging2
-			title = Collect Science from around the Moon and transmit it to the KSC
-			hideChildren = true
-		}
 	}
 }