diff --git a/src/(attributes) b/src/(attributes)
index 2b2c581..73e3ae3 100644
Binary files a/src/(attributes) and b/src/(attributes) differ
diff --git a/src/DocumentHeader b/src/DocumentHeader
index ceee381..3dd87a8 100644
Binary files a/src/DocumentHeader and b/src/DocumentHeader differ
diff --git a/src/MapScript.galaxy b/src/MapScript.galaxy
index aa8fcfe..3fcc478 100644
--- a/src/MapScript.galaxy
+++ b/src/MapScript.galaxy
@@ -1221,6 +1221,7 @@ void gf_DatabaseUnits () {
     gv_buttonUnitFile[(gv_iUnit - 1)] = "Assets\\Textures\\btn-unit-terran-hellionbattlemode.dds";
     gf_GetUnitDataAuto("WidowMine");
     gf_GetUnitDataAuto("Cyclone");
+    gf_GetUnitDataAuto("Liberator");
     gv_iUnit += 1;
     gf_GetUnitDataAuto("Drone");
     gf_GetUnitDataAuto("Zergling");
@@ -1264,7 +1265,7 @@ void gf_DatabaseResearch () {
     gf_GetResearchDataManual("WarpGateResearch", "Assets\\Textures\\btn-building-protoss-warpgate.dds", "ResearchWarpGate", 0, "CyberneticsCoreResearch", "6");
     gf_GetResearchDataManual("Charge", "Assets\\Textures\\btn-ability-protoss-charge-color.dds", "ResearchCharge", 0, "TwilightCouncilResearch", "0");
     gf_GetResearchDataManual("BlinkTech", "Assets\\Textures\\btn-ability-protoss-blink-color.dds", "ResearchStalkerTeleport", 0, "TwilightCouncilResearch", "1");
-    gf_GetResearchDataManual("AdeptKillBounce", "Assets\\Textures\\btn-techupgrade-terran-consumption.dds", "ResearchAdeptKillBounce", 0, "TwilightCouncilResearch", "2");
+    gf_GetResearchDataManual("AdeptShieldUpgrade", "Assets\\Textures\\btn-upgrade-protoss-adeptshieldupgrade.dds", "ResearchAdeptShieldUpgrade", 0, "TwilightCouncilResearch", "3");
     gf_GetResearchDataManual("PsiStormTech", "Assets\\Textures\\btn-ability-protoss-psistorm-color.dds", "ResearchPsiStorm", 0, "TemplarArchivesResearch", "4");
     gf_GetResearchDataManual("ObserverGraviticBooster", "Assets\\Textures\\btn-upgrade-protoss-graviticbooster.dds", "ResearchGraviticBooster", 0, "RoboticsBayResearch", "1");
     gf_GetResearchDataManual("GraviticDrive", "Assets\\Textures\\btn-upgrade-protoss-graviticdrive.dds", "ResearchGraviticDrive", 0, "RoboticsBayResearch", "2");
@@ -1295,11 +1296,13 @@ void gf_DatabaseResearch () {
     gf_GetResearchDataManual("HighCapacityBarrels", "Assets\\Textures\\btn-upgrade-terran-infernalpreigniter.dds", "ResearchHighCapacityBarrels", 0, "FactoryTechLabResearch", "1");
     gf_GetResearchDataManual("DrillClaws", "Assets\\Textures\\btn-upgrade-terran-researchdrillingclaws.dds", "ResearchDrillClaws", 0, "FactoryTechLabResearch", "4");
     gf_GetResearchDataManual("CycloneLockOnRangeUpgrade", "Assets\\Textures\\btn-upgrade-terran-durablematerials.dds", "ResearchLockOnRangeUpgrade", 0, "FactoryTechLabResearch", "5");
+    gf_GetResearchDataManual("CycloneAirUpgrade", "Assets\\Textures\\btn-ability-terran-surfacetoairtargeting.dds", "CycloneResearchLockOnAir", 0, "FactoryTechLabResearch", "7");
     gf_GetResearchDataManual("MedivacCaduceusReactor", "Assets\\Textures\\btn-upgrade-terran-caduceusreactor.dds", "ResearchMedivacEnergyUpgrade", 0, "StarportTechLabResearch", "2");
     gf_GetResearchDataManual("DurableMaterials", "Assets\\Textures\\btn-upgrade-terran-durablematerials.dds", "ResearchDurableMaterials", 0, "StarportTechLabResearch", "7");
     gf_GetResearchDataManual("RavenCorvidReactor", "Assets\\Textures\\btn-upgrade-terran-corvidreactor.dds", "ResearchRavenEnergyUpgrade", 0, "StarportTechLabResearch", "3");
     gf_GetResearchDataManual("BansheeCloak", "Assets\\Textures\\btn-ability-terran-cloak-color.dds", "ResearchBansheeCloak", 0, "StarportTechLabResearch", "0");
     gf_GetResearchDataManual("BansheeSpeed", "Assets\\Textures\\btn-upgrade-terran-reapernitropacks.dds", "BansheeSpeed", 0, "StarportTechLabResearch", "9");
+    gf_GetResearchDataManual("LiberatorMorph", "Assets\\Textures\\btn-upgrade-terran-liberator-agmode.dds", "ResearchLiberatorAGMode", 0, "StarportTechLabResearch", "10");
     gf_GetResearchDataManual("BattlecruiserEnableSpecializations", "Assets\\Textures\\btn-ability-terran-yamatogun-color.dds", "ResearchBattlecruiserSpecializations", 0, "FusionCoreResearch", "0");
     gf_GetResearchDataManual("BattlecruiserBehemothReactor", "Assets\\Textures\\btn-upgrade-terran-behemothreactor.dds", "ResearchBattlecruiserEnergyUpgrade", 0, "FusionCoreResearch", "1");
     gv_iUnit += 1;
@@ -1322,16 +1325,13 @@ void gf_DatabaseResearch () {
     gf_GetResearchDataManual("zerglingmovementspeed", "Assets\\Textures\\btn-upgrade-zerg-metabolicboost.dds", "zerglingmovementspeed", 0, "SpawningPoolResearch", "0");
     gf_GetResearchDataManual("zerglingattackspeed", "Assets\\Textures\\btn-upgrade-zerg-adrenalglands.dds", "zerglingattackspeed", 0, "SpawningPoolResearch", "1");
     gf_GetResearchDataManual("GlialReconstitution", "Assets\\Textures\\btn-upgrade-zerg-glialreconstitution.dds", "EvolveGlialRegeneration", 0, "RoachWarrenResearch", "1");
-    gf_GetResearchDataManual("TunnelingClaws", "Assets\\Textures\\btn-upgrade-zerg-tunnelingclaws.dds", "EvolveTunnelingClaws", 0, "RoachWarrenResearch", "2");
     gf_GetResearchDataManual("CentrificalHooks", "Assets\\Textures\\btn-upgrade-zerg-centrifugalhooks.dds", "EvolveCentrificalHooks", 0, "BanelingNestResearch", "0");
     gf_GetResearchDataManual("hydraliskspeed", "Assets\\Textures\\btn-upgrade-zerg-groovedspines.dds", "hydraliskspeed", 0, "HydraliskDenResearch", "2");
     gf_GetResearchDataManual("overlordspeed", "Assets\\Textures\\btn-upgrade-zerg-pneumatizedcarapace.dds", "overlordspeed", 0, "LairResearch", "1");
     gf_GetResearchDataManual("overlordtransport", "Assets\\Textures\\btn-upgrade-zerg-ventralsacs.dds", "EvolveVentralSacks", 0, "LairResearch", "2");
     gf_GetResearchDataManual("InfestorEnergyUpgrade", "Assets\\Textures\\btn-upgrade-zerg-pathogenglands.dds", "EvolveInfestorEnergyUpgrade", 0, "InfestationPitResearch", "2");
     gf_GetResearchDataManual("NeuralParasite", "Assets\\Textures\\btn-ability-zerg-neuralparasite-color.dds", "ResearchNeuralParasite", 0, "InfestationPitResearch", "3");
-    gf_GetResearchDataManual("FlyingLocusts", "Assets\\Textures\\btn-unit-zerg-locustflyer.dds", "EvolveFlyingLocusts", 0, "InfestationPitResearch", "5");
     gf_GetResearchDataManual("ChitinousPlating", "Assets\\Textures\\btn-upgrade-zerg-chitinousplating.dds", "EvolveChitinousPlating", 0, "UltraliskCavernResearch", "2");
-    gf_GetResearchDataManual("HydraliskSpeedUpgrade", "Assets\\Textures\\btn-upgrade-zerg-evolvemuscularaugments.dds", "MuscularAugments", 0, "HydraliskDenResearch", "3");
 }
 
 void gf_GetUnitDataAuto (string lp_inputUnitLink) {
diff --git a/src/Triggers b/src/Triggers
index f8f98ec..ac2ec7b 100644
--- a/src/Triggers
+++ b/src/Triggers
@@ -869,6 +869,7 @@
         <FunctionCall Type="FunctionCall" Id="85BE3A32"/>
         <FunctionCall Type="FunctionCall" Id="55062D13"/>
         <FunctionCall Type="FunctionCall" Id="DB28A054"/>
+        <FunctionCall Type="FunctionCall" Id="FA15086F"/>
         <FunctionCall Type="FunctionCall" Id="AD35B28B"/>
         <FunctionCall Type="FunctionCall" Id="0841CF5E"/>
         <FunctionCall Type="FunctionCall" Id="C30E6805"/>
@@ -1835,11 +1836,13 @@
         <FunctionCall Type="FunctionCall" Id="E6407661"/>
         <FunctionCall Type="FunctionCall" Id="1B32FA51"/>
         <FunctionCall Type="FunctionCall" Id="B3C16383"/>
+        <FunctionCall Type="FunctionCall" Id="E01B72F0"/>
         <FunctionCall Type="FunctionCall" Id="B210A75E"/>
         <FunctionCall Type="FunctionCall" Id="AFE8BE03"/>
         <FunctionCall Type="FunctionCall" Id="197C45A6"/>
         <FunctionCall Type="FunctionCall" Id="B2F1B9B7"/>
         <FunctionCall Type="FunctionCall" Id="7D9DB23C"/>
+        <FunctionCall Type="FunctionCall" Id="2793CDEE"/>
         <FunctionCall Type="FunctionCall" Id="B99FED6F"/>
         <FunctionCall Type="FunctionCall" Id="1125981C"/>
         <FunctionCall Type="FunctionCall" Id="374DEC9E"/>
@@ -4855,6 +4858,15 @@
         <Parameter Type="Param" Id="276F98DC"/>
         <Parameter Type="Param" Id="86468CB4"/>
     </Element>
+    <Element Type="FunctionCall" Id="2793CDEE">
+        <FunctionDef Type="FunctionDef" Id="28AC02A4"/>
+        <Parameter Type="Param" Id="355451C5"/>
+        <Parameter Type="Param" Id="A014BCBC"/>
+        <Parameter Type="Param" Id="E9B8566D"/>
+        <Parameter Type="Param" Id="FB1086CB"/>
+        <Parameter Type="Param" Id="F06A0A00"/>
+        <Parameter Type="Param" Id="D22F8F54"/>
+    </Element>
     <Element Type="FunctionCall" Id="27A869C9">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="C41602B8"/>
         <Parameter Type="Param" Id="3D80DBC0"/>
@@ -5236,6 +5248,7 @@
         <Parameter Type="Param" Id="AD19A4F9"/>
     </Element>
     <Element Type="FunctionCall" Id="2BA1C577">
+        <Disabled/>
         <FunctionDef Type="FunctionDef" Id="28AC02A4"/>
         <Parameter Type="Param" Id="16BB5F1B"/>
         <Parameter Type="Param" Id="DBEAB96A"/>
@@ -8327,6 +8340,7 @@
         <FunctionCall Type="FunctionCall" Id="59CFFBCB"/>
     </Element>
     <Element Type="FunctionCall" Id="5B3F99BE">
+        <Disabled/>
         <FunctionDef Type="FunctionDef" Id="28AC02A4"/>
         <Parameter Type="Param" Id="329119E9"/>
         <Parameter Type="Param" Id="3C0AED7B"/>
@@ -12908,6 +12922,7 @@
         <FunctionCall Type="FunctionCall" Id="E132A8A1"/>
     </Element>
     <Element Type="FunctionCall" Id="A05A4A69">
+        <Disabled/>
         <FunctionDef Type="FunctionDef" Id="28AC02A4"/>
         <Parameter Type="Param" Id="D9828D2A"/>
         <Parameter Type="Param" Id="E6B7D8E0"/>
@@ -17351,6 +17366,15 @@
         <FunctionCall Type="FunctionCall" Id="0A1DF6C4"/>
         <FunctionCall Type="FunctionCall" Id="CE84C88F"/>
     </Element>
+    <Element Type="FunctionCall" Id="E01B72F0">
+        <FunctionDef Type="FunctionDef" Id="28AC02A4"/>
+        <Parameter Type="Param" Id="D12E83C0"/>
+        <Parameter Type="Param" Id="B50D9D57"/>
+        <Parameter Type="Param" Id="4376C592"/>
+        <Parameter Type="Param" Id="F1C72D97"/>
+        <Parameter Type="Param" Id="D7B3719A"/>
+        <Parameter Type="Param" Id="C2F2D4C0"/>
+    </Element>
     <Element Type="FunctionCall" Id="E027115D">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="F463A414"/>
     </Element>
@@ -19099,6 +19123,10 @@
     <Element Type="FunctionCall" Id="FA138E85">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="4AB42F83"/>
     </Element>
+    <Element Type="FunctionCall" Id="FA15086F">
+        <FunctionDef Type="FunctionDef" Id="B6FAB3D1"/>
+        <Parameter Type="Param" Id="62F692DD"/>
+    </Element>
     <Element Type="FunctionCall" Id="FA28E53C">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="20E3B9BE"/>
     </Element>
@@ -22234,7 +22262,7 @@
     </Element>
     <Element Type="Param" Id="177A9857">
         <ParameterDef Type="ParamDef" Id="B895E5E0"/>
-        <Value>2</Value>
+        <Value>3</Value>
         <ValueType Type="string"/>
     </Element>
     <Element Type="Param" Id="1788A0D9">
@@ -24429,7 +24457,7 @@
     </Element>
     <Element Type="Param" Id="295FC715">
         <ParameterDef Type="ParamDef" Id="044E2D9C"/>
-        <Value>Assets\Textures\btn-techupgrade-terran-consumption.dds</Value>
+        <Value>Assets\Textures\btn-upgrade-protoss-adeptshieldupgrade.dds</Value>
         <ValueType Type="filepath"/>
         <ValueTypeInfo Value="5"/>
     </Element>
@@ -25770,6 +25798,12 @@
         <Variable Type="Variable" Id="E1975B08"/>
         <Array Type="Param" Id="F72228EC"/>
     </Element>
+    <Element Type="Param" Id="355451C5">
+        <ParameterDef Type="ParamDef" Id="B2BC0A10"/>
+        <Value>LiberatorMorph</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Upgrade"/>
+    </Element>
     <Element Type="Param" Id="35554BE7">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="4DF6106C"/>
         <ValueType Type="text"/>
@@ -27509,6 +27543,11 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="4DF6106C"/>
         <FunctionCall Type="FunctionCall" Id="04B29653"/>
     </Element>
+    <Element Type="Param" Id="4376C592">
+        <ParameterDef Type="ParamDef" Id="74A4AE48"/>
+        <Value>0</Value>
+        <ValueType Type="int"/>
+    </Element>
     <Element Type="Param" Id="437DC719">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
         <Variable Type="Variable" Id="FE24FBCF"/>
@@ -30596,7 +30635,7 @@
     </Element>
     <Element Type="Param" Id="5EC969BD">
         <ParameterDef Type="ParamDef" Id="B2BC0A10"/>
-        <Value>AdeptKillBounce</Value>
+        <Value>AdeptShieldUpgrade</Value>
         <ValueType Type="gamelink"/>
         <ValueGameType Type="Upgrade"/>
     </Element>
@@ -31044,6 +31083,12 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="D0B26923"/>
         <Variable Type="Variable" Id="7EE40765"/>
     </Element>
+    <Element Type="Param" Id="62F692DD">
+        <ParameterDef Type="ParamDef" Id="1A2A3824"/>
+        <Value>Liberator</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Unit"/>
+    </Element>
     <Element Type="Param" Id="62F7733C">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="B6DEBC8D"/>
         <FunctionCall Type="FunctionCall" Id="5BD74877"/>
@@ -31761,7 +31806,7 @@
     </Element>
     <Element Type="Param" Id="68E6BF3D">
         <ParameterDef Type="ParamDef" Id="53C25E0E"/>
-        <Value>ResearchAdeptKillBounce</Value>
+        <Value>ResearchAdeptShieldUpgrade</Value>
         <ValueType Type="string"/>
     </Element>
     <Element Type="Param" Id="68F236BB">
@@ -38147,6 +38192,11 @@
         <Value>0</Value>
         <ValueType Type="string"/>
     </Element>
+    <Element Type="Param" Id="A014BCBC">
+        <ParameterDef Type="ParamDef" Id="53C25E0E"/>
+        <Value>ResearchLiberatorAGMode</Value>
+        <ValueType Type="string"/>
+    </Element>
     <Element Type="Param" Id="A017DC8C">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="7A93D947"/>
         <Variable Type="Variable" Id="1D16932B"/>
@@ -40681,6 +40731,11 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000220"/>
         <FunctionCall Type="FunctionCall" Id="64B2E5F7"/>
     </Element>
+    <Element Type="Param" Id="B50D9D57">
+        <ParameterDef Type="ParamDef" Id="53C25E0E"/>
+        <Value>CycloneResearchLockOnAir</Value>
+        <ValueType Type="string"/>
+    </Element>
     <Element Type="Param" Id="B5199048">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="BA2D0420"/>
         <Parameter Type="ParamDef" Id="88EC4C22"/>
@@ -42278,6 +42333,12 @@
         <Value>9</Value>
         <ValueType Type="int"/>
     </Element>
+    <Element Type="Param" Id="C2F2D4C0">
+        <ParameterDef Type="ParamDef" Id="044E2D9C"/>
+        <Value>Assets\Textures\btn-ability-terran-surfacetoairtargeting.dds</Value>
+        <ValueType Type="filepath"/>
+        <ValueTypeInfo Value="5"/>
+    </Element>
     <Element Type="Param" Id="C2F92081">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="1A8752D4"/>
         <ValueType Type="point"/>
@@ -44055,6 +44116,12 @@
             ""
         </ScriptCode>
     </Element>
+    <Element Type="Param" Id="D12E83C0">
+        <ParameterDef Type="ParamDef" Id="B2BC0A10"/>
+        <Value>CycloneAirUpgrade</Value>
+        <ValueType Type="gamelink"/>
+        <ValueGameType Type="Upgrade"/>
+    </Element>
     <Element Type="Param" Id="D137503F">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="51567265"/>
         <Preset Type="PresetValue" Library="Ntve" Id="1E7A4625"/>
@@ -44168,6 +44235,12 @@
         <Value>1</Value>
         <ValueType Type="int"/>
     </Element>
+    <Element Type="Param" Id="D22F8F54">
+        <ParameterDef Type="ParamDef" Id="044E2D9C"/>
+        <Value>Assets\Textures\btn-upgrade-terran-liberator-agmode.dds</Value>
+        <ValueType Type="filepath"/>
+        <ValueTypeInfo Value="5"/>
+    </Element>
     <Element Type="Param" Id="D23EE3EF">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000691"/>
         <Value>Carrier</Value>
@@ -44780,6 +44853,11 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="F603F646"/>
         <Preset Type="PresetValue" Library="Ntve" Id="7ADC9421"/>
     </Element>
+    <Element Type="Param" Id="D7B3719A">
+        <ParameterDef Type="ParamDef" Id="7C197A2B"/>
+        <Value>FactoryTechLabResearch</Value>
+        <ValueType Type="string"/>
+    </Element>
     <Element Type="Param" Id="D7BE5F89">
         <ParameterDef Type="ParamDef" Id="B895E5E0"/>
         <Value>10</Value>
@@ -46835,6 +46913,11 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="D0B26923"/>
         <Variable Type="Variable" Id="7EE40765"/>
     </Element>
+    <Element Type="Param" Id="E9B8566D">
+        <ParameterDef Type="ParamDef" Id="74A4AE48"/>
+        <Value>0</Value>
+        <ValueType Type="int"/>
+    </Element>
     <Element Type="Param" Id="E9CB1449">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="ABB380C4"/>
         <Variable Type="Variable" Id="E4DF2D3F"/>
@@ -47602,6 +47685,11 @@
         <Value>25</Value>
         <ValueType Type="int"/>
     </Element>
+    <Element Type="Param" Id="F06A0A00">
+        <ParameterDef Type="ParamDef" Id="7C197A2B"/>
+        <Value>StarportTechLabResearch</Value>
+        <ValueType Type="string"/>
+    </Element>
     <Element Type="Param" Id="F07177E5">
         <ParameterDef Type="ParamDef" Id="B2BC0A10"/>
         <Value>TerranShipWeaponsLevel2</Value>
@@ -47746,6 +47834,11 @@
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000692"/>
         <Preset Type="PresetValue" Library="Ntve" Id="2999701E"/>
     </Element>
+    <Element Type="Param" Id="F1C72D97">
+        <ParameterDef Type="ParamDef" Id="B895E5E0"/>
+        <Value>7</Value>
+        <ValueType Type="string"/>
+    </Element>
     <Element Type="Param" Id="F1CF678A">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="CAF028C1"/>
         <Value>500</Value>
@@ -48954,6 +49047,11 @@
         <Value>-;Missile,Dead,Hidden,Invulnerable</Value>
         <ValueType Type="unitfilter"/>
     </Element>
+    <Element Type="Param" Id="FB1086CB">
+        <ParameterDef Type="ParamDef" Id="B895E5E0"/>
+        <Value>10</Value>
+        <ValueType Type="string"/>
+    </Element>
     <Element Type="Param" Id="FB152461">
         <ParameterDef Type="ParamDef" Library="Ntve" Id="00000410"/>
         <Preset Type="PresetValue" Library="Ntve" Id="00000218"/>
diff --git a/src/Triggers.version b/src/Triggers.version
index d9f1e79..b2b93fd 100644
Binary files a/src/Triggers.version and b/src/Triggers.version differ