diff --git a/Classic/scripts/autoexec/GetRandomMaps.cs b/Classic/scripts/autoexec/GetRandomMaps.cs
index f06cbe6..c01308e 100644
--- a/Classic/scripts/autoexec/GetRandomMaps.cs
+++ b/Classic/scripts/autoexec/GetRandomMaps.cs
@@ -42,6 +42,27 @@ $LakRandomMapPick13 = "Raindance_nefLak"; 	$LakRandomMapPick14 = "SaddiesHill";
 $LakRandomMapPick16 = "PhasmaDustLak"; 		$LakRandomMapPick17 = "Sulfide"; 			$LakRandomMapPick18 = "HavenLak"; 
 //19-21
 $LakRandomMapPick19 = "Crater71Lak"; 		$LakRandomMapPick20 = "SolsDescentLak"; 	$LakRandomMapPick21 = "FrozenFuryLak"; 
+//22-24
+$LakRandomMapPick22 = "CankerLak"; 			$LakRandomMapPick23 = "S8_GeothermalLak"; 	$LakRandomMapPick24 = "EquinoxLak"; 
+//
+//LCTF
+//
+//1-5
+$LCTFRandomMapPick1 = "BastardForgeLT"; 		$LCTFRandomMapPick2 = "FirestormLT"; 		$LCTFRandomMapPick3 = "DangerousCrossingLT"; 	$LCTFRandomMapPick4 = "S5_DamnationLT"; 				$LCTFRandomMapPick5 = "TenebrousCTF"; 
+//6-10
+$LCTFRandomMapPick6 = "SmallCrossingLT"; 		$LCTFRandomMapPick7 = "CirclesEdgeLT"; 		$LCTFRandomMapPick8 = "TheFray"; 				$LCTFRandomMapPick9 = "SignalLT"; 						$LCTFRandomMapPick10 = "StarFallLT"; 
+//11-15
+$LCTFRandomMapPick11 = "DireLT"; 				$LCTFRandomMapPick12 = "S5_Icedance"; 		$LCTFRandomMapPick13 = "TWL2_HildebrandLT"; 	$LCTFRandomMapPick14 = "TWL2_CanyonCrusadeDeluxeLT";	$LCTFRandomMapPick15 = "TWL2_FrozenHopeLT"; 
+//16-20
+$LCTFRandomMapPick16 = "RoundTheMountainLT"; 	$LCTFRandomMapPick17 = "Blink"; 			$LCTFRandomMapPick18 = "TWL2_SkylightLT"; 		$LCTFRandomMapPick19 = "TWL_BeachBlitzLT"; 				$LCTFRandomMapPick20 = "S5_MassiveLT"; 
+//21-25
+$LCTFRandomMapPick21 = "S5_Mimicry"; 			$LCTFRandomMapPick22 = "S5_SilenusLT"; 		$LCTFRandomMapPick23 = "S5_Mordacity"; 			$LCTFRandomMapPick24 = "S5_Woodymyrk"; 					$LCTFRandomMapPick25 = "S8_Cardiac"; 
+//26-30
+$LCTFRandomMapPick26 = "S8_Opus"; 				$LCTFRandomMapPick27 = "TWL2_Celerity"; 	$LCTFRandomMapPick28 = "TWL2_Crevice"; 			$LCTFRandomMapPick29 = "S5_HawkingHeat"; 				$LCTFRandomMapPick30 = "TWL2_MidnightMayhemDeluxe"; 
+//31-35
+$LCTFRandomMapPick31 = "Discord"; 				$LCTFRandomMapPick32 = "Bulwark"; 			$LCTFRandomMapPick33 = "ArenaDome"; 			$LCTFRandomMapPick34 = "SmallTimeLT"; 					$LCTFRandomMapPick35 = "RaindanceLT"; 
+//36-40
+$LCTFRandomMapPick36 = "TWL_OsIris"; 			$LCTFRandomMapPick37 = "TWL_Damnation"; 	$LCTFRandomMapPick38 = "Headstone"; 			$LCTFRandomMapPick39 = "BeggarsRunLT"; 					$LCTFRandomMapPick40 = "Berlard"; 
 
 
 
@@ -80,6 +101,7 @@ function SetNextMapGetRandoms( %client )
 		%LakRandomPick5 = getRandom(13,15);
 		%LakRandomPick6 = getRandom(16,18);
 		%LakRandomPick7 = getRandom(19,21);
+		%LakRandomPick8 = getRandom(22,24);
 		
 		//Deduction code		
 		$SetNextMissionMapSlot1 = $LakRandomMapPick[%LakRandomPick1];
@@ -89,6 +111,41 @@ function SetNextMapGetRandoms( %client )
 		$SetNextMissionMapSlot5 = $LakRandomMapPick[%LakRandomPick5];
 		$SetNextMissionMapSlot6 = $LakRandomMapPick[%LakRandomPick6];
 		$SetNextMissionMapSlot7 = $LakRandomMapPick[%LakRandomPick7];
+		$SetNextMissionMapSlot8 = $LakRandomMapPick[%LakRandomPick8];
 	}
+	else if( $CurrentMissionType $= "SCtF" )
+	{
+		//Get random numbers
+		%LCTFRandomPick1 = getRandom(1,5);
+		%LCTFRandomPick2 = getRandom(6,10);
+		%LCTFRandomPick3 = getRandom(11,15);
+		%LCTFRandomPick4 = getRandom(16,20);
+		%LCTFRandomPick5 = getRandom(21,25);
+		%LCTFRandomPick6 = getRandom(26,30);
+		%LCTFRandomPick7 = getRandom(31,35);
+		%LCTFRandomPick8 = getRandom(36,40);
 
+		//Deduction code
+		$SetNextMissionMapSlot1 = $LCTFRandomMapPick[%LCTFRandomPick1];
+		$SetNextMissionMapSlot2 = $LCTFRandomMapPick[%LCTFRandomPick2];
+		$SetNextMissionMapSlot3 = $LCTFRandomMapPick[%LCTFRandomPick3];
+		$SetNextMissionMapSlot4 = $LCTFRandomMapPick[%LCTFRandomPick4];
+		$SetNextMissionMapSlot5 = $LCTFRandomMapPick[%LCTFRandomPick5];
+		$SetNextMissionMapSlot6 = $LCTFRandomMapPick[%LCTFRandomPick6];
+		$SetNextMissionMapSlot7 = $LCTFRandomMapPick[%LCTFRandomPick7];
+		$SetNextMissionMapSlot8 = $LCTFRandomMapPick[%LCTFRandomPick8];
+	}
+	else if( $CurrentMissionType $= "DM" )
+	{
+		$SetNextMissionMapSlot1 = "RaspDM";
+		$SetNextMissionMapSlot2 = "EntombedDM";
+		$SetNextMissionMapSlot3 = "IceDomeDM";
+		$SetNextMissionMapSlot4 = "HoofToeDM";
+		$SetNextMissionMapSlot5 = "ArenaDomeDM";
+		$SetNextMissionMapSlot6 = "VulcansWrathDM";
+		$SetNextMissionMapSlot7 = "";
+		$SetNextMissionMapSlot8 = "";
+	}
+	else
+		return;
 }
\ No newline at end of file
diff --git a/Classic/scripts/autoexec/MapRepetitionChecker.cs b/Classic/scripts/autoexec/MapRepetitionChecker.cs
index 0956a01..93112ec 100644
--- a/Classic/scripts/autoexec/MapRepetitionChecker.cs
+++ b/Classic/scripts/autoexec/MapRepetitionChecker.cs
@@ -1,6 +1,8 @@
 //To help decrease the chances of a repeated map in the map rotation by correcting repeated maps thru script
 //$EvoCachedNextMission = "RoundTheMountain";
 //$EvoCachedNextMission = "Arrakis";
+//$EvoCachedNextMission = "RoundTheMountainLT";
+//$EvoCachedNextMission = "ArenaDomeDM";
 //
 //
 $PreviousMission4back = "";
@@ -17,7 +19,7 @@ function MapRepetitionChecker( %game )
 	if(!$GetRandomMapsLoaded)
 		return;
 	
-	if( ($CurrentMissionType $= "CTF" || $CurrentMissionType $= "LakRabbit" ) && !$Host::TournamentMode && $MapRepetitionCheckerRunOnce !$= 1 )
+	if(!$Host::TournamentMode && $MapRepetitionCheckerRunOnce !$= 1 )
 	{
 		if( $PreviousMission1back $= $EvoCachedNextMission || $PreviousMission2back $= $EvoCachedNextMission || $PreviousMission3back $= $EvoCachedNextMission || $PreviousMission4back $= $EvoCachedNextMission )
 			MapRepetitionCheckerFindRandom();
@@ -48,18 +50,8 @@ function MapRepetitionCheckerFindRandom()
 	else
 		return;
 	
-	if( $CurrentMissionType $= "CTF" )
-	{
-		%MapCheckerRandom = getRandom(1,6);
-		$EvoCachedNextMission = $SetNextMissionMapSlot[%MapCheckerRandom];
-	}
-	else if( $CurrentMissionType $= "LakRabbit" )
-	{
-		%MapCheckerRandom = getRandom(1,3);
-		$EvoCachedNextMission = $SetNextMissionMapSlot[%MapCheckerRandom];
-	}
-	else
-		return;
+	%MapCheckerRandom = getRandom(1,6);
+	$EvoCachedNextMission = $SetNextMissionMapSlot[%MapCheckerRandom];
 	
 	if($EvoCachedNextMission $= $PreviousMission1back || $EvoCachedNextMission $= $PreviousMission2back || $EvoCachedNextMission $= $PreviousMission3back || $EvoCachedNextMission $= $PreviousMission4back)
 		MapRepetitionCheckerFindRandom();