diff --git a/Classic/prefs/MapRotation.cs b/Classic/prefs/MapRotation.cs
index a7bfdef..7fa0535 100644
--- a/Classic/prefs/MapRotation.cs
+++ b/Classic/prefs/MapRotation.cs
@@ -55,13 +55,16 @@ addRotationMap("Minotaur",						"CTF",1,0,-1,18);
 addRotationMap("SmallMelee",					"CTF",1,0,-1,12);
 //addRotationMap("SuperHappyBouncyFunTime",		"CTF",1,1,-1,12);
 addRotationMap("Machineeggs",					"CTF",1,1,-1,8);
-addRotationMap("Mac_FlagArena",					"CTF",1,0,-1,18);
+addRotationMap("Mac_FlagArena",					"CTF",1,0,-1,14);
 addRotationMap("SmallTimeCTF",					"CTF",1,1,-1,10);
 addRotationMap("TWL2_Hildebrand",				"CTF",1,1,-1,18);
-addRotationMap("ArenaDome",						"CTF",1,1,-1,12);
-addRotationMap("Firestorm",						"CTF",1,1,-1,12);
+addRotationMap("ArenaDome",						"CTF",1,0,-1,12);
+addRotationMap("Firestorm",						"CTF",1,0,-1,12);
 addRotationMap("Bulwark",						"CTF",1,1,-1,12);
-addRotationMap("TWL_OsIris",					"CTF",1,1,-1,12);
+addRotationMap("TWL_OsIris",					"CTF",1,0,8,18);
+addRotationMap("FrostPipe",						"CTF",1,0,-1,12);
+addRotationMap("Blink",							"CTF",1,1,-1,12);
+addRotationMap("Discord",						"CTF",1,1,6,16);
 
 //Medium Maps
 /////////////////////////////////////////////////////////////////////
@@ -70,25 +73,24 @@ addRotationMap("HighOctane",					"CTF",1,1,8,24);
 addRotationMap("S5_Mordacity",					"CTF",1,1,8,24);
 addRotationMap("S5_Damnation",					"CTF",1,1,8,20);
 addRotationMap("TWL2_JaggedClaw",				"CTF",1,1,8,24);
-addRotationMap("S5_Massive",					"CTF",1,1,8,26);
+addRotationMap("S5_Massive",					"CTF",1,1,10,26);
 addRotationMap("TWL_Stonehenge",				"CTF",1,1,8,20);
-addRotationMap("TWL_Feign",						"CTF",1,0,12,24);
-addRotationMap("TheFray",						"CTF",1,1,8,20);
+addRotationMap("TWL_Feign",						"CTF",1,1,10,20);
+addRotationMap("TheFray",						"CTF",1,0,10,20);
 addRotationMap("DangerousCrossing_nef",			"CTF",1,1,8,20);
 addRotationMap("TWL2_Skylight",					"CTF",1,1,8,20);
 addRotationMap("TWL2_Ocular",					"CTF",1,1,12,-1);
-addRotationMap("Dire",							"CTF",1,1,12,24);
-addRotationMap("berlard",						"CTF",1,1,12,24);
-addRotationMap("S8_Opus",						"CTF",1,1,8,24);
-addRotationMap("BeggarsRun",					"CTF",1,1,8,24);
-addRotationMap("Headstone",						"CTF",1,1,8,20);
+addRotationMap("Dire",							"CTF",1,1,10,24);
+addRotationMap("berlard",						"CTF",1,0,12,24);
+addRotationMap("S8_Opus",						"CTF",1,0,8,24);
+addRotationMap("BeggarsRun",					"CTF",1,0,8,24);
+addRotationMap("Headstone",						"CTF",1,0,8,20);
 addRotationMap("Signal",						"CTF",1,0,8,26);
 addRotationMap("S5_Woodymyrk",					"CTF",1,1,8,26);
-addRotationMap("Discord",						"CTF",1,1,8,20);
-addRotationMap("TenebrousCTF",					"CTF",1,1,8,20);
+addRotationMap("TenebrousCTF",					"CTF",1,1,8,12);
 addRotationMap("Pariah",						"CTF",1,0,8,20);
-addRotationMap("Prismatic",						"CTF",1,0,12,26);
-addRotationMap("TWL_WilderZone",				"CTF",1,1,8,20);
+addRotationMap("Prismatic",						"CTF",1,1,12,26);
+addRotationMap("TWL_WilderZone",				"CTF",1,0,8,20);
 addRotationMap("Mirage",						"CTF",1,0,8,20);
 addRotationMap("S5_Mimicry",					"CTF",1,0,8,24);
 addRotationMap("TWL_Snowblind",					"CTF",1,0,12,-1);
@@ -96,7 +98,6 @@ addRotationMap("ShortFall",						"CTF",1,0,12,24);
 addRotationMap("IceRidge_nef",					"CTF",1,0,8,20);
 addRotationMap("Disjointed",					"CTF",1,0,8,20);
 addRotationMap("TWL2_MuddySwamp",				"CTF",1,0,8,20);
-addRotationMap("Blink",							"CTF",1,1,8,20);
 addRotationMap("HighAnxiety",					"CTF",1,0,8,20);
 addRotationMap("S5_Centaur",					"CTF",1,0,8,20);
 addRotationMap("S8_Cardiac",					"CTF",1,1,12,-1);
@@ -107,6 +108,8 @@ addRotationMap("TWL2_Drifts",					"CTF",1,0,14,24);
 addRotationMap("TWL2_Drorck",					"CTF",1,1,12,24);
 //addRotationMap("TWL2_Norty",					"CTF",1,0,12,24);
 addRotationMap("S5_HawkingHeat",				"CTF",1,0,16,24);
+addRotationMap("StarFallCTF",					"CTF",1,1,10,24);
+addRotationMap("TWL2_Celerity",					"CTF",1,1,8,24);
 
 //Voteable but Not in Rotation
 /////////////////////////////////////////////////////////////////////
@@ -128,9 +131,8 @@ addRotationMap("Confusco",						"CTF",1,0,10,20);
 //addRotationMap("Fallout",						"CTF",1,0,10,20);
 //addRotationMap("TheClocktower",				"CTF",1,0,10,20);
 //addRotationMap("SoylentGreen",				"CTF",1,0,10,20);
-addRotationMap("TWL2_MidnightMayhemDeluxe",		"CTF",1,0,8,18);
+addRotationMap("TWL2_MidnightMayhemDeluxe",		"CTF",1,1,8,18);
 //addRotationMap("Ramparts",					"CTF",1,0,10,20);
-addRotationMap("TWL2_Celerity",					"CTF",1,1,8,24);
 //addRotationMap("Blastside_nef",				"CTF",1,0,10,24);
 addRotationMap("Burstside",						"CTF",1,0,10,20);
 addRotationMap("Infernus",						"CTF",1,0,18,26);
@@ -144,20 +146,20 @@ addRotationMap("TWL_Pandemonium",				"CTF",1,0,10,24);
 //Vehicle Maps
 /////////////////////////////////////////////////////////////////////
 
+addRotationMap("Logans_Run",					"CTF",1,1,8,28);
+addRotationMap("Rollercoaster_nef",				"CTF",1,1,8,28);
 addRotationMap("HostileLoch",					"CTF",1,1,12,24);
-addRotationMap("TWL_BeachBlitz",				"CTF",1,0,12,24);
+addRotationMap("TWL_BeachBlitz",				"CTF",1,1,12,24);
 addRotationMap("TWL2_Magnum",					"CTF",1,1,12,28);
-addRotationMap("Logans_Run",					"CTF",1,1,10,28);
-addRotationMap("Rollercoaster_nef",				"CTF",1,1,10,28);
 addRotationMap("MoonDance",						"CTF",1,1,12,28);
 addRotationMap("Raindance_nef",					"CTF",1,1,12,28);
-addRotationMap("TWL_Magmatic",					"CTF",1,1,18,28);
+addRotationMap("TWL_Magmatic",					"CTF",1,0,18,28);
 addRotationMap("TWL2_FrozenGlory",				"CTF",1,1,12,24);
-addRotationMap("LandingParty",					"CTF",1,0,12,28);
-addRotationMap("TitanV",						"CTF",1,1,12,28);
-addRotationMap("TWL_Crossfire",					"CTF",1,1,18,-1);
+addRotationMap("LandingParty",					"CTF",1,1,12,28);
+addRotationMap("TitanV",						"CTF",1,0,12,28);
+addRotationMap("TWL_Crossfire",					"CTF",1,1,14,28);
 //addRotationMap("The_Calm",					"CTF",1,0,12,24);
-addRotationMap("TWL2_Dissention",				"CTF",1,1,16,28);
+addRotationMap("TWL2_Dissention",				"CTF",1,0,16,28);
 
 //Vehicle Maps: Voteable, But Not in Rotation
 /////////////////////////////////////////////////////////////////////
@@ -169,7 +171,7 @@ addRotationMap("ShockRidge",					"CTF",1,0,12,24);
 addRotationMap("TWL2_BlueMoon",					"CTF",1,1,18,28);
 addRotationMap("TWL_Katabatic",					"CTF",1,0,12,28);
 addRotationMap("TWL_Starfallen",				"CTF",1,0,12,24);
-addRotationMap("ConstructionYard",				"CTF",1,0,12,24);
+//addRotationMap("ConstructionYard",				"CTF",1,0,12,24);
 //addRotationMap("AcidRain",					"CTF",1,0,12,24);
 addRotationMap("SandOcean",						"CTF",1,0,12,28);
 //addRotationMap("StarIce",						"CTF",1,0,12,24);
@@ -183,6 +185,7 @@ addRotationMap("TWL_Abaddon",					"CTF",1,0,16,24);
 //BIG Vehicle Maps
 /////////////////////////////////////////////////////////////////////
 
+addRotationMap("Circleofstones",				"CTF",1,1,12,-1);
 addRotationMap("TWL2_Ruined",					"CTF",1,1,24,-1);
 addRotationMap("Agorazscium",					"CTF",1,0,24,-1);
 addRotationMap("FullCircle",					"CTF",1,0,18,30);
@@ -199,9 +202,8 @@ addRotationMap("TWL_Frozen",					"CTF",1,0,20,-1);
 addRotationMap("TWL_Harvester",					"CTF",1,1,24,-1);
 addRotationMap("Archipelago",					"CTF",1,0,20,-1);
 addRotationMap("TWL2_Bleed",					"CTF",1,0,20,-1);
-addRotationMap("Pantheon",						"CTF",1,1,24,-1);
-addRotationMap("Circleofstones",				"CTF",1,1,18,-1);
-addRotationMap("DeathBirdsFly1",				"CTF",1,1,24,-1);
+addRotationMap("Pantheon",						"CTF",1,1,20,-1);
+addRotationMap("DeathBirdsFly1",				"CTF",1,1,20,-1);
 addRotationMap("Scarabrae_nef",					"CTF",1,0,28,-1);
 addRotationMap("aabaa",							"CTF",1,1,28,-1);
 addRotationMap("TWL_Reversion",					"CTF",1,1,28,-1);
@@ -287,17 +289,17 @@ addRotationMap("S8_CentralDogma",				"CTF",1,0,-1,-1);
 //In Rotation
 /////////////////////////////////////////////////////////////////////
 
-addRotationMap("VaubanLak",						"Lakrabbit",1,1,-1,-1);
+addRotationMap("VaubanLak",						"Lakrabbit",1,1,8,-1);
 addRotationMap("MiniSunDried",					"Lakrabbit",1,1,-1,12);
 addRotationMap("Sundance",						"Lakrabbit",1,1,-1,-1);
-addRotationMap("TWL_BeachBlitzLak",				"Lakrabbit",1,0,-1,-1);
-addRotationMap("DesertofDeathLak",				"Lakrabbit",1,0,-1,-1);
+addRotationMap("TWL_BeachBlitzLak",				"Lakrabbit",1,1,-1,-1);
+addRotationMap("DesertofDeathLak",				"Lakrabbit",1,1,-1,-1);
 addRotationMap("Raindance_nefLak",				"Lakrabbit",1,1,-1,-1);
 addRotationMap("SunDriedLak",					"Lakrabbit",1,1,-1,-1);
 addRotationMap("SkinnyDipLak",					"Lakrabbit",1,1,-1,-1);
 addRotationMap("SaddiesHill",					"Lakrabbit",1,0,-1,-1);
 addRotationMap("HavenLak",						"Lakrabbit",1,0,-1,-1);
-addRotationMap("LushLak",						"Lakrabbit",1,1,-1,-1);
+addRotationMap("LushLak",						"Lakrabbit",1,1,8,-1);
 addRotationMap("BoxLak",						"Lakrabbit",1,1,-1,10);
 addRotationMap("TitaniaLak",					"Lakrabbit",1,0,8,-1);
 addRotationMap("TibbawLak",						"Lakrabbit",1,1,-1,-1);
@@ -305,7 +307,8 @@ addRotationMap("InfernusLak",					"Lakrabbit",1,1,-1,-1);
 addRotationMap("S8_GeothermalLak",				"Lakrabbit",1,1,-1,-1);
 addRotationMap("CankerLak",						"Lakrabbit",1,1,-1,-1);
 addRotationMap("DustRunLak",					"Lakrabbit",1,1,-1,-1);
-addRotationMap("CrossfiredLak",					"Lakrabbit",1,1,-1,-1);
+addRotationMap("CrossfiredLak",					"Lakrabbit",1,0,-1,-1);
+addRotationMap("CloakofLak",					"Lakrabbit",1,1,-1,-1);
 
 //Voteable, But not in rotation
 /////////////////////////////////////////////////////////////////////
@@ -317,8 +320,8 @@ addRotationMap("Arrakis",						"Lakrabbit",1,0,-1,-1);
 addRotationMap("EquinoxLak",					"Lakrabbit",1,0,-1,-1);
 addRotationMap("PhasmaDustLak",					"Lakrabbit",1,1,-1,12);
 addRotationMap("GodsRiftLak",					"Lakrabbit",1,0,-1,-1);
-addRotationMap("SolsDescentLak",				"Lakrabbit",1,1,-1,-1);
-addRotationMap("Crater71Lak",					"Lakrabbit",1,0,-1,-1);
+addRotationMap("SolsDescentLak",				"Lakrabbit",1,0,-1,-1);
+addRotationMap("Crater71Lak",					"Lakrabbit",1,1,6,-1);
 
 //Not Voteable, Not in rotation
 /////////////////////////////////////////////////////////////////////
@@ -552,4 +555,4 @@ addRotationMap("PitsDM",						"DM",1,1,-1,10);
 // |_|  |_|\__,_|_| |_|\__\___|_|  |___/
 /////////////////////////////////////////////////////////////////////
 
-addRotationMap("MiniSunDried",				"Hunters",1,1,-1,-1);
+//addRotationMap("MiniSunDried",				"Hunters",1,1,-1,-1);