diff --git a/scripts/scr_PlanetData/scr_PlanetData.gml b/scripts/scr_PlanetData/scr_PlanetData.gml
index 920fda060..95334432f 100644
--- a/scripts/scr_PlanetData/scr_PlanetData.gml
+++ b/scripts/scr_PlanetData/scr_PlanetData.gml
@@ -17,14 +17,7 @@ function PlanetData(planet, system) constructor{
     pdf = system.p_pdf[planet];
     fortification_level  = system.p_fortified[planet];
     star_station = system.p_station[planet];
-
-    static name = function(){
-    	var _name="";
-    	with (system){
-    		_name =  planet_numeral_name(planet);
-    	}
-    	return _name;
-    }
+    pdf_loss_reduction = 0;
 
     // Whether or not player forces are on the planet
     player_forces = system.p_player[planet];
@@ -38,23 +31,18 @@ function PlanetData(planet, system) constructor{
     	player_forces,
     	guardsmen,
     	0,
+    	0,
     	system.p_sisters[planet],
     	system.p_eldar[planet],
     	system.p_orks[planet],
     	system.p_tau[planet],
     	system.p_tyranids[planet],
+		system.p_traitors[planet],    	
     	system.p_chaos[planet]+ system.p_demons[planet],
-    	system.p_traitors[planet],
     	0,
     	system.p_necrons[planet]
     ]
-    static xenos_and_heretics = function(){
-    	var xh_force = 0;
-    	for (var i=5;i<array_length(planet_forces); i++){
-    		xh_force += planet_forces[i];
-    	} 
-    	return xh_force;
-    }
+
     deamons = system.p_demons[planet];
     chaos_forces = system.p_chaos[planet];
 
@@ -79,6 +67,22 @@ function PlanetData(planet, system) constructor{
     problem_data = system.p_problem_other_data[planet];
     problem_timers = system.p_timer[planet];
 
+    static name = function(){
+    	var _name="";
+    	with (system){
+    		_name =  planet_numeral_name(planet);
+    	}
+    	return _name;
+    }
+
+    static xenos_and_heretics = function(){
+    	var xh_force = 0;
+    	for (var i=5;i<array_length(planet_forces); i++){
+    		xh_force += planet_forces[i];
+    	} 
+    	return xh_force;
+    }
+    
     static marine_training = planet_training_sequence;
 
     static has_feature = function(feature){
@@ -164,4 +168,186 @@ function PlanetData(planet, system) constructor{
 		}
 	} 
 
+	static guard_score_calc = function(){
+		guard_score = 0;
+        if (guardsmen < 500 && guardsmen>0) {
+		    guard_score = 0.1;
+		} else if (guardsmen >= 100000000) {
+		    guard_score = 7;
+		} else if (guardsmen >= 50000000) {
+		    guard_score = 6;
+		} else if (guardsmen >= 15000000) {
+		    guard_score = 5;
+		} else if (guardsmen >= 6000000) {
+		    guard_score = 4;
+		} else if (guardsmen >= 1000000) {
+		    guard_score = 3;
+		} else if (guardsmen >= 100000) {
+		    guard_score = 2;
+		} else if (guardsmen >= 2000) {
+		    guard_score = 1;
+		} else {
+		    guard_score = 0.5;
+		}
+
+		return guard_score;
+	}
+
+	static continue_to_planet_battle = function(stop){
+
+	    var _nids_real = planet_forces[eFACTION.Tyranids];
+	    var _nids_score = _nids_real < 4 ? 0 : _nids_real;
+	    var _nid_diff = _nids_score-_nids_real;
+
+	    if (chaos_forces==6.1) and (_nids_real>0) then tyranids_score=_nids_real;
+
+	    if (current_owner == eFACTION.Tau){
+ 			stop = (xenos_and_heretics() + _nid_diff + player_forces + planet_forces[eFACTION.Ecclesiarchy]) <= 0;
+	    }
+	   	
+	   	if (stop){
+	   		if (planet_forces[eFACTION.Ork]>0) and (planet_forces[eFACTION.Ecclesiarchy]>0) then stop=0;
+	   	}
+
+	    var imperium_forces = ((guardsmen>0) or (pdf>0) or (planet_forces[eFACTION.Ecclesiarchy]>0));
+
+	    if (stop){
+	    	if (planet_forces[eFACTION.Necrons]>=5 || planet_forces[eFACTION.Tyranids]>=5 && imperium_forces) then stop=0;
+	    }
+
+
+	    //tau fight imperial
+	    if (stop){
+	    	if (current_owner = eFACTION.Tau){
+				if ((guardsmen>0) or (planet_forces[eFACTION.Ecclesiarchy]>0)) and ((pdf>0) or (planet_forces[eFACTION.Tau]>0)) then stop=0;
+	    	}
+	    	
+	    }
+    
+	    // Attack heretics whenever possible, even player controlled ones
+	    if (stop){
+	    	if (player_forces+pdf>0) and (guardsmen>0) and (obj_controller.faction_status[2]="War") then stop=0;
+	    }
+	    if (stop){
+	    	if (player_forces+pdf>0) and (planet_forces[eFACTION.Ecclesiarchy]>0) and (obj_controller.faction_status[5]="War") then stop=0;
+	    }
+
+	    return stop;
+	}
+
+	static pdf_will_support_player = function(){
+		if (current_owner== eFACTION.Tau){
+			return false;
+		}
+		if (has_feature(P_features.Gene_Stealer_Cult) && current_owner==eFACTION.Tyranids){
+			return false;
+		}
+
+		if ((current_owner=1 || obj_controller.faction_status[2]!="War") && pdf){
+			return true;
+		}
+		return false;
+	}
+
+	static guard_attack_matrix = function(){
+		var guard_attack = "";
+	    // if (p_eldar[planet]>0) and (p_owner[planet]!=6) then guard_attack="eldar";
+	    //if (planet_forces[eFACTION.Tau] + planet_forces[eFACTION.Ork] + planet_forces[eFACTION.Heretics]+ planet_forces[eFACTION.Chaos])
+	    if (planet_forces[eFACTION.Tau]>0) then guard_attack="tau";
+	    if (planet_forces[eFACTION.Ork]>0) then guard_attack="ork";
+	    if (planet_forces[eFACTION.Heretics]>0){
+	    		    // Always goes after traitors first, unless
+	    	guard_attack="traitors";
+			if (planet_forces[eFACTION.Heretics]<=1 && planet_forces[eFACTION.Tau]>=4) and (current_owner!=8) then guard_attack="tau";	    	
+	    }
+	    if (planet_forces[eFACTION.Chaos]>0) then guard_attack="csm";
+	    if (pdf>0) and (current_owner=eFACTION.Tau) then guard_attack="pdf";
+
+	    if (current_owner = eFACTION.Player){
+	    	if (pdf>0 && obj_controller.faction_status[2]=="War") then guard_attack="pdf";
+	    }
+	    if (planet_forces[eFACTION.Tyranids]<=1) and (planet_forces[eFACTION.Ork]>=4) then guard_attack="ork";
+	    // if (p_tyranids[planet]>0) and (guard_attack="") then guard_attack="tyranids";
+	    if (planet_forces[eFACTION.Tyranids]>=4){
+	    	guard_attack="tyranids";
+	    }else if (planet_forces[eFACTION.Tyranids]<4 && planet_forces[eFACTION.Tyranids]>0){
+			 if (has_feature(P_features.Gene_Stealer_Cult)){
+	 			var _hidden_cult = get_features(P_features.Gene_Stealer_Cult)[0].hiding;
+	 			if (!_hidden_cult){
+	 				guard_attack="tyranids";
+	 			}
+	 		}
+	    }	
+
+	    return guard_attack;		
+	}
+
+
+	static pdf_attack_matrix = function(){
+		var _no_notable_traitors = planet_forces[eFACTION.Heretics]<=1;
+		var _pdf_attack = "";
+		if (planet_forces[eFACTION.Tyranids]>=4 && !has_feature(P_features.Gene_Stealer_Cult)){
+			_pdf_attack = "tyranids";
+		}
+
+		if (_no_notable_traitors &&  _pdf_attack=="") {
+			if ((planet_forces[eFACTION.Ork]>=4)){
+				_pdf_attack="ork";
+			} else if (planet_forces[eFACTION.Tau]>=4 && current_owner!=8){
+				_pdf_attack="tau";
+			}
+		} 
+		if (guardsmen && _pdf_attack==""){
+			if (obj_controller.faction_status[2]=="War"){
+				if (pdf_will_support_player()){
+					_pdf_attack="guard";
+				}
+			} else if (current_owner == eFACTION.Tau){
+				_pdf_attack="guard";
+			}
+		}
+
+		if (_pdf_attack==""){
+			if (planet_forces[eFACTION.Chaos]>0){
+				_pdf_attack="csm";
+			} else if (planet_forces[eFACTION.Heretics]>0){
+				_pdf_attack="traitors";
+			} else if ((planet_forces[eFACTION.Ork]>0)){
+				_pdf_attack="ork";
+			} else  if (planet_forces[eFACTION.Tau]>0) and (current_owner!=eFACTION.Tau){
+				_pdf_attack="tau";
+			}
+		}
+        // Always goes after traitors first, unless
+        return _pdf_attack;				
+	}
+
+	static pdf_loss_reduction_calc = function(){
+		pdf_loss_reduction = fortification_level*0.001;
+		if (pdf_will_support_player()){
+			pdf_loss_reduction+=garrison.viable_garrison*0.0005;
+		}
+		return pdf_loss_reduction;
+	}
+
+	static pdf_defence_loss_to_orks = function(){
+		var active_garrison = pdf_will_support_player() && garrison.viable_garrison>0;
+        if (planet_forces[eFACTION.Ork]>=4) and (pdf>=30000){
+        	pdf=floor(pdf*(min(0.95, 0.55+pdf_loss_reduction)));
+    	}
+        else if (planet_forces[eFACTION.Ork]>=4 && pdf<30000 && pdf>=10000){
+        	pdf=active_garrison?pdf*0.4:0;
+        }
+        else if (planet_forces[eFACTION.Ork]>=3) and (pdf<10000){
+        	pdf=active_garrison?pdf*0.4:0;
+        }
+        else if (planet_forces[eFACTION.Ork]<3 && pdf>30000){
+        	pdf=floor(pdf*(min(0.95, 0.7+pdf_loss_reduction)));
+        }
+        if (planet_forces[eFACTION.Ork]>=2) and (pdf<2000){ pdf=0;}
+        if (planet_forces[eFACTION.Ork]>=1) and (pdf<200){ pdf=0;}
+
+        system.p_pdf[planet] = pdf;
+	}
+
 }
\ No newline at end of file
diff --git a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml
index cc6b9817c..9c6cc6030 100644
--- a/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml
+++ b/scripts/scr_enemy_ai_a/scr_enemy_ai_a.gml
@@ -109,10 +109,14 @@ function scr_enemy_ai_a() {
 	var stop;
 	var rand=0;
     var garrison_force=false, total_garrison=0;
+    var _planet_data;
 	for (var _run =1;_run<=planets;_run++){
+		_planet_data = new PlanetData(_run, self);
 		garrison_force=false;
 		var garrison = new GarrisonForce(p_operatives[_run], true);
 		var sabatours = new GarrisonForce(p_operatives[_run], true, "sabotage");
+		_planet_data.garrison = garrison;
+		_planet_data.sabatours = sabatours;
 
 		garrison_force = garrison.garrison_force;
 		array_push(system_garrison, garrison);
@@ -121,11 +125,7 @@ function scr_enemy_ai_a() {
 		stop=0;
 	    ensure_no_planet_negatives(_run);
 
-	    planet_forces = planet_forces_array(_run);
-
-    	if (planet_forces[eFACTION.Tyranids] < 4){
-    		planet_forces[eFACTION.Tyranids] = 0;
-    	}
+	    planet_forces = _planet_data.planet_forces;
 
     	var present_forces = [];
     	for (var i=0;i<array_length(planet_forces);i++){
@@ -137,43 +137,35 @@ function scr_enemy_ai_a() {
     	if (array_length(present_forces) == 1 && !p_pdf[_run]){// if there is only one faction with present forces the planet belongs ot that faction
     		p_owner[_run] = present_forces[0];
     		stop=1;
+    		continue;
     	} else if (planet_forces[eFACTION.Player]<=0) and (planet_forces[eFACTION.Ork]>0){//orks prevail  over other factions
     		if (p_owner[_run]==2 or p_owner[_run]==6){
     			p_owner[_run]=eFACTION.Ork;
     		}
     	}
+    	if (!stop){
+    		stop = _planet_data.continue_to_planet_battle(stop);
+    		if (stop){
+    			continue;
+    		}
+    	}
+	    var large=0;
+	    var guard_score=0;
+	    var pdf_score=0;
+	    var eldar_score=0;
     
 
-	    var guard_score, pdf_score,   traitors_score, csm_score, eldar_score, tyranids_score, necrons_score, sisters_score, large;
-	    large=0;guard_score=0;pdf_score=0;traitors_score=0;csm_score=0;eldar_score=0;tyranids_score=0;necrons_score=0;sisters_score=0;
+	    var guard_attack="",pdf_attack="",ork_attack="",tau_attack="",traitors_attack="",csm_attack="";
+	    var eldar_attack="",tyranids_attack="",necrons_attack="",sisters_attack="";
     
-	    var guard_attack, pdf_attack, ork_attack, tau_attack, traitors_attack, csm_attack, eldar_attack, tyranids_attack, necrons_attack, sisters_attack;
-	    guard_attack="";pdf_attack="";ork_attack="";tau_attack="";traitors_attack="";csm_attack="";
-	    eldar_attack="";tyranids_attack="";necrons_attack="";sisters_attack="";
-    
-	    traitors_score=p_traitors[_run];
-	    csm_score=p_chaos[_run];
-	    tyranids_score=p_tyranids[_run];
-	    necrons_score=p_necrons[_run];
-	    sisters_score=p_sisters[_run];
+	    var traitors_score=p_traitors[_run];
+	    var csm_score=p_chaos[_run];
+	    var tyranids_score=p_tyranids[_run];
+	    var necrons_score=p_necrons[_run];
+	    var sisters_score=p_sisters[_run];
 	    // if (p_eldar[_run]>0) then eldar_score=p_eldar[_run]+1;
-    
-    
-	    if (p_tyranids[_run]<4) then tyranids_score=0;
-	    if (p_chaos[_run]=6.1) and (p_tyranids[_run]>0) then tyranids_score=p_tyranids[_run];
-	    if (p_tau[_run]=0) and (p_orks[_run]=0) and (p_traitors[_run]=0) and (p_chaos[_run]=0) and (p_player[_run]<=0) and (tyranids_score<5) and (p_necrons[_run]=0) and (p_owner[_run]=8) and (p_sisters[_run]=0) then stop=1;
-    
-	    if (p_orks[_run]>0) and (p_sisters[_run]>0) then stop=0;
-	    var imperium_forces = ((p_guardsmen[_run]>0) or (p_pdf[_run]>0) or (p_sisters[_run]>0));
-	    if (p_necrons[_run]>=5 && imperium_forces) then stop=0;
-	    if (p_tyranids[_run]>=5 && imperium_forces) then stop=0;
-	    if ((p_guardsmen[_run]>0) or (p_sisters[_run]>0)) and ((p_pdf[_run]>0) or (p_tau[_run]>0)) and (p_owner[_run]=8) and (stop=1) then stop=0;
-    
-	    // Attack heretics whenever possible, even player controlled ones
-	    if (p_player[_run]+p_pdf[_run]>0) and (p_guardsmen[_run]>0) and (obj_controller.faction_status[2]="War") then stop=0;
-	    if (p_player[_run]+p_pdf[_run]>0) and (p_sisters[_run]>0) and (obj_controller.faction_status[5]="War") then stop=0;
-    
-    
+    	if (p_tyranids[_run]<4) then tyranids_score=0;
+
 	    if (p_tyranids[_run]>0) and (stop!=1) and (p_owner[_run]!=9){// This might have been causing the problem
 	        /*if (p_tyranids[_run]<5) and (p_guardsmen[_run]>0){
 	            if (p_tyranids[_run]=4) then p_guardsmen[_run]=max(0,p_guardsmen[_run]-100000);
@@ -184,70 +176,40 @@ function scr_enemy_ai_a() {
 	        if (p_tyranids[_run]>=5) then tyranids_score=7;
 	    }
     
-     	var pdf_with_player=false;
-    	var pdf_loss_reduction=p_fortified[_run]*0.001;//redues man loss from battle loss if higher defences
-    	if (p_owner[_run]!=8) && (p_owner[_run]=1 ||obj_controller.faction_status[2]!="War") && (garrison_force){
-    		pdf_with_player = true;
-        	pdf_loss_reduction+=garrison.viable_garrison*0.0005;
-    	}   
-    
+     	var pdf_with_player=_planet_data.pdf_will_support_player();
+    	var pdf_loss_reduction=_planet_data.pdf_loss_reduction_calc();//redues man loss from battle loss if higher defences
+    	
+    	if (!stop){
+    		guard_score = _planet_data.guard_score_calc();
+    	}
 	    if (p_guardsmen[_run]>0) and (stop!=1){
-	       if (p_guardsmen[_run] < 500) {
-			    guard_score = 0.1;
-			} else if (p_guardsmen[_run] >= 100000000) {
-			    guard_score = 7;
-			} else if (p_guardsmen[_run] >= 50000000) {
-			    guard_score = 6;
-			} else if (p_guardsmen[_run] >= 15000000) {
-			    guard_score = 5;
-			} else if (p_guardsmen[_run] >= 6000000) {
-			    guard_score = 4;
-			} else if (p_guardsmen[_run] >= 1000000) {
-			    guard_score = 3;
-			} else if (p_guardsmen[_run] >= 100000) {
-			    guard_score = 2;
-			} else if (p_guardsmen[_run] >= 2000) {
-			    guard_score = 1;
-			} else {
-			    guard_score = 0.5;
-			}
-        
-        	
-        	guard_attack = guard_target_matrix(_run);
+	    	guard_score = _planet_data.guard_score_calc();
+        	guard_attack = _planet_data.guard_attack_matrix();
+
 	        if (guard_attack="tyranids") then tyranids_score=p_tyranids[_run];
 	        // Tend to prioritize traitors > Orks > Tau
 	        // Eldar don't get into pitched battles so nyuck nyuck nyuck
 	    }
-	    if (((p_guardsmen[_run]=0) or ((guard_score<=0.5))) or (p_owner[_run]==8)) or ((p_guardsmen[_run]>0) and (obj_controller.faction_status[2]=="War")) and (p_pdf[_run]>0) and (stop!=1){
+	    if (_planet_data.pdf>0 && !stop){
 	    	var pdf_mod;
-	    	var defence_mult = p_fortified[_run]*0.1;
+	    	var defence_mult = _planet_data.fortification_level*0.1;
 
 	    	try {
-		    	if (pdf_with_player){//if player supports give garrison bonus
-			    	pdf_score=determine_pdf_defence(p_pdf[_run],garrison,p_fortified[_run])[0];
+		    	if (pdf_with_player && garrison_force){//if player supports give garrison bonus
+			    	pdf_score=determine_pdf_defence(_planet_data.pdf,garrison,_planet_data.fortification_level)[0];
 		    	} else{
-		    		pdf_score=determine_pdf_defence(p_pdf[_run],,p_fortified[_run])[0];
+		    		pdf_score=determine_pdf_defence(_planet_data.pdf,,_planet_data.fortification_level)[0];
 		    	}
 	    	}catch(_exception) {
 			    handle_exception(_exception,,,,_run);
 			}
 	        // 
 	        // if (p_eldar[_run]>0) and (p_owner[_run]!=6) then pdf_attack="eldar";
-	        if (p_tyranids[_run]>=4) then pdf_attack="tyranids";
-	        if (p_tau[_run]>0) and (p_owner[_run]!=8) then pdf_attack="tau";
-	        if (p_orks[_run]>0) then pdf_attack="ork";
-	        if (p_traitors[_run]>0) then pdf_attack="traitors";
-	        if (p_chaos[_run]>0) then pdf_attack="csm";
-	        if (p_guardsmen[_run]>0) and (p_owner[_run]=8) then pdf_attack="guard";
-	        if (p_guardsmen[_run]>0) and (p_owner[_run]=1) and (obj_controller.faction_status[2]="War") then pdf_attack="guard";
-	        // Always goes after traitors first, unless
-	        if (p_traitors[_run]<=1) and (p_tau[_run]>=4) and (p_owner[_run]!=8) then pdf_attack="tau";
-	        if (p_traitors[_run]<=1) and (p_orks[_run]>=4) then pdf_attack="ork";
-	        if (p_tyranids[_run]>=4) then pdf_attack="tyranids";
+	        pdf_attack = _planet_data.pdf_attack_matrix();
 	    }
     
 	    if (p_sisters[_run]>0) and (stop!=1){// THEY MARCH FOR THE ECCLESIARCHY
-	    	if (p_player[_run]>0) and (obj_controller.faction_status[5]="War"){
+	    	if (p_player[_run]>0) and (obj_controller.faction_status[5]=="War"){
 	    		sisters_attack="player";
 	    	} else {
 		        if (p_tau[_run]>0) then sisters_attack="tau";
@@ -352,7 +314,7 @@ function scr_enemy_ai_a() {
     
     
     
-	    if (stop=0){// Start stop
+	    if (!stop){// Start stop
 
 	    default_imperium_attack = guard_score>0 && !((guard_score<=0.5) && (pdf_score>1)) ?"guard":"pdf";
     
@@ -575,20 +537,7 @@ function scr_enemy_ai_a() {
 	            rand2=(pdf_random*pdf_score);
 	            var active_garrison = pdf_with_player && garrison.viable_garrison>0;
 	            if (rand1>rand2){
-	                if (planet_forces[eFACTION.Ork]>=4) and (p_pdf[_run]>=30000){
-	                	p_pdf[_run]=floor(p_pdf[_run]*(min(0.95, 0.55+pdf_loss_reduction)));
-	            	}
-	                else if (planet_forces[eFACTION.Ork]>=4 && p_pdf[_run]<30000 && p_pdf[_run]>=10000){
-	                	p_pdf[_run]=active_garrison?p_pdf[_run]*0.4:0;
-	                }
-	                else if (planet_forces[eFACTION.Ork]>=3) and (p_pdf[_run]<10000){
-	                	p_pdf[_run]=active_garrison?p_pdf[_run]*0.4:0;
-	                }
-	                else if (planet_forces[eFACTION.Ork]<3 && p_pdf[_run]>30000){
-	                	p_pdf[_run]=floor(p_pdf[_run]*(min(0.95, 0.7+pdf_loss_reduction)));
-	                }
-	                if (planet_forces[eFACTION.Ork]>=2) and (p_pdf[_run]<2000){ p_pdf[_run]=0;}
-	                if (planet_forces[eFACTION.Ork]>=1) and (p_pdf[_run]<200){ p_pdf[_run]=0;}
+	            	_planet_data.pdf_defence_loss_to_orks();
 
 	                if (active_garrison){
 	                	var tixt = $"Chapter Forces led by {garrison.garrison_leader.name_role()} on {name} {scr_roman_numerals()[_run-1]} were unable to secure PDF victory chapter support requested";
@@ -611,7 +560,7 @@ function scr_enemy_ai_a() {
 	            if (p_pdf[_run]=0) and (p_player[_run]<=0){
 	                var badd=1;
                 
-	                if (p_pdf[1]+p_pdf[2]+p_pdf[3]+p_pdf[4]=0) and (p_guardsmen[1]+p_guardsmen[2]+p_guardsmen[3]+p_guardsmen[4]=0){
+	                if (array_sum(p_pdf)==0) and (p_guardsmen[1]+p_guardsmen[2]+p_guardsmen[3]+p_guardsmen[4]=0){
 	                    badd=2;
 	                }
                 
@@ -822,14 +771,14 @@ function scr_enemy_ai_a() {
             
             
 	            if (p_pdf[_run]=0) and (p_player[_run]<=0) and (p_necrons[_run]>0){
-	                var badd;badd=1;
+	                var _system_overrun=false;
                 
-	                if (p_pdf[1]+p_pdf[2]+p_pdf[3]+p_pdf[4]=0) and (p_guardsmen[1]+p_guardsmen[2]+p_guardsmen[3]+p_guardsmen[4]=0){
-	                    badd=2;
+	                if (!array_sum(p_pdf,0, 1, planets) && !array_sum(p_guardsmen,0, 1, planets)){
+	                    _system_overrun=true;
 	                }
                 
-					if (badd = 1) and(p_tyranids[_run] < 5) and(p_orks[_run] = 0) and(p_traitors[_run] = 0) {
-					    scr_alert("red", "owner", string(name) + " " + string(_run) + " has been overwhelmed by Necrons!", x, y);
+					if (!_system_overrun) and(p_tyranids[_run] < 5) and(p_orks[_run] = 0) and(p_traitors[_run] = 0) {
+					    scr_alert("red", "owner", $"{_planet_data.name()} has been overwhelmed by Necrons!", x, y);
 					    if (visited == 1) {
 					        if (p_type[_run] == "Forge") { //visited variable check whether the star has been visisted or not 1 for true 0 for false
 					            dispo[_run] -= 10; // 10 Disposition decrease for the planet govrnor if it's overrun by necrons
@@ -841,9 +790,9 @@ function scr_enemy_ai_a() {
 					    }
 					}
 					
-	                if (badd=2) and (p_tyranids[_run]<5) and (p_orks[_run]=0) and (p_traitors[_run]=0){
-	                    scr_popup("System Lost","The "+string(name)+" system has been ovewhelmed by Necrons!","necron_army","");
-	                    scr_event_log("red","System "+string(name)+" has been overwhelmed by Necrons.", name);
+	                if (_system_overrun && p_tyranids[_run]<5 && p_orks[_run]=0 && p_traitors[_run]=0){
+	                    scr_popup("System Lost",$"The {name} system has been ovewhelmed by Necrons!","necron_army","");
+	                    scr_event_log("red",$"System {name} has been overwhelmed by Necrons.", name);
 	                }
 	            }
             
@@ -871,7 +820,7 @@ function scr_enemy_ai_a() {
     
     
 	    // 135;
-	    p_time_since_saved[_run] = 0;
+
 	    var planet_saved =  ((p_player[_run] + p_raided[_run]) > 0 && p_orks[_run] = 0 && p_tyranids[_run] < 4 && p_chaos[_run] = 0 && p_traitors[_run] = 0 && p_necrons[_run] = 0 && p_tau[_run] = 0);
 
 	    if (planet_saved){
@@ -939,7 +888,7 @@ function scr_enemy_ai_a() {
 	    // Restock PDF and military
 	    var i;
 	    i = 0;
-	    repeat(4) {
+	    repeat(planets) {
 	        i += 1;
 	        if (p_type[i] == "Daemon") {
 	            p_heresy[i] = 200;
diff --git a/scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.gml b/scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.gml
index d57739b4e..7f834040c 100644
--- a/scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.gml
+++ b/scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.gml
@@ -49,26 +49,6 @@ function planet_forces_array(planet){
 	return force_array;
 }
 
-function guard_target_matrix(planet){
-	guard_attack = "";
-    // if (p_eldar[planet]>0) and (p_owner[planet]!=6) then guard_attack="eldar";
-    //if (planet_forces[eFACTION.Tau] + planet_forces[eFACTION.Ork] + planet_forces[eFACTION.Heretics]+ planet_forces[eFACTION.Chaos])
-    if (p_tau[planet]>0) then guard_attack="tau";
-    if (p_orks[planet]>0) then guard_attack="ork";
-    if (p_traitors[planet]>0) then guard_attack="traitors";
-    if (p_chaos[planet]>0) then guard_attack="csm";
-    if (p_pdf[planet]>0) and (p_owner[planet]=8) then guard_attack="pdf";
-
-    // Always goes after traitors first, unless
-    if (p_traitors[planet]<=1) and (p_tau[planet]>=4) and (p_owner[planet]!=8) then guard_attack="tau";
-    if (p_pdf[planet]>0) and (obj_controller.faction_status[2]="War") and (p_owner[planet]=1) then guard_attack="pdf";
-    if (p_traitors[planet]<=1) and (p_orks[planet]>=4) then guard_attack="ork";
-    // if (p_tyranids[planet]>0) and (guard_attack="") then guard_attack="tyranids";
-    if (p_tyranids[planet]>=4) then guard_attack="tyranids";	
-
-    return guard_attack;
-}
-