diff --git a/data/core/macros/ai_controller.cfg b/data/core/macros/ai_controller.cfg
index c666cfb6642..5c5673d65b1 100644
--- a/data/core/macros/ai_controller.cfg
+++ b/data/core/macros/ai_controller.cfg
@@ -153,9 +153,8 @@
                         [command]
                             {VARIABLE order_type aggression}
 
-                            [fire_event]
-                                name=apply_ai_params
-                            [/fire_event]
+			    {MODIFY_AI_ADD_SIMPLE_ASPECT $ally_side aggression set_by_ai_controller "0.9"}
+			    {MODIFY_AI_ADD_SIMPLE_ASPECT $ally_side caution set_by_ai_controller "0.1"}
 
                             {VARIABLE ai_controller.side_$ally_side|_current_settings.current_behaviour aggression}
                             {VARIABLE ai_controller.side_$ally_side|_current_settings.currently_doing_behaviour_description _"aggressive."}
@@ -190,9 +189,8 @@
                             {VARIABLE ai_controller.side_$ally_side|_current_settings.current_behaviour caution}
                             {VARIABLE ai_controller.side_$ally_side|_current_settings.currently_doing_behaviour_description _"defensive."}
 
-                            [fire_event]
-                                name=apply_ai_params
-                            [/fire_event]
+			    {MODIFY_AI_ADD_SIMPLE_ASPECT $ally_side aggression ai_controller "0.1"}
+			    {MODIFY_AI_ADD_SIMPLE_ASPECT $ally_side caution ai_controller "1.0"}
                         [/command]
                     [/option]
                 [/caution]
@@ -308,9 +306,15 @@
                                                         {VARIABLE ai_controller.side_$ally_side|_current_settings.current_objective focus_on_enemy}
                                                         {VARIABLE ai_controller.side_$ally_side|_current_settings.currently_doing_objective_description _"focusing on defeating $this_enemy_description|."}
 
-                                                        [fire_event]
-                                                            name=apply_ai_params
-                                                        [/fire_event]
+							{MODIFY_AI_ADD_GOAL $ally_side (
+                                                            [goal]
+                                                                id=set_by_ai_controller
+                                                                value=20
+                                                                [criteria]
+                                                                    side=$temp_i
+                                                                [/criteria]
+                                                            [/goal]
+							)}
                                                     [/command]
                                                 [/value]
                                             [/set_variables]
@@ -458,9 +462,17 @@
                                                         {VARIABLE ai_controller.side_$ally_side|_current_settings.current_objective protect}
                                                         {VARIABLE ai_controller.side_$ally_side|_current_settings.currently_doing_objective_description _"focusing on protecting $this_ally_description|."}
 
-                                                        [fire_event]
-                                                            name=apply_ai_params
-                                                        [/fire_event]
+							{MODIFY_AI_ADD_GOAL $ally_side (
+                                                            [goal]
+                                                                id=set_by_ai_controller
+                                                                name=protect
+                                                                value=20
+                                                                [criteria]
+                                                                    side=$temp_i
+                                                                [/criteria]
+                                                            [/goal]
+							)}
+
                                                     [/command]
                                                 [/value]
                                             [/set_variables]
@@ -550,9 +562,18 @@
                                     {VARIABLE ai_controller.side_$ally_side|_current_settings.current_objective defend_location}
                                     {VARIABLE ai_controller.side_$ally_side|_current_settings.currently_doing_objective_description _"focusing on defending the area around $x1|,$y1|."}
 
-                                    [fire_event]
-                                        name=apply_ai_params
-                                    [/fire_event]
+
+
+                                    {MODIFY_AI_ADD_GOAL $ally_side (
+                                        [goal]
+                                            id=set_by_ai_controller
+                                            name=protect
+                                            value=20
+                                            [criteria]
+                                                x,y=$x1,$y1
+                                            [/criteria]
+                                        [/goal]
+                                    )}
 
                                     [print]
                                         text=" "	# wmllint: ignore
@@ -608,10 +629,7 @@
                         [/show_if]
 
                         [command]
-                            [insert_tag]
-                                name=modify_side
-                                variable=ai_controller.side_$ally_side|_original_settings.ai_settings
-                            [/insert_tag]
+                            {MODIFY_AI_DELETE_GOAL $ally_side set_by_ai_controller}
 
                             {CLEAR_VARIABLE ai_controller.side_$ally_side|_current_settings.current_objective}
                         [/command]
@@ -632,10 +650,8 @@
                         [/show_if]
 
                         [command]
-                            [insert_tag]
-                                name=modify_side
-                                variable=ai_controller.side_$ally_side|_original_settings.ai_settings
-                            [/insert_tag]
+                            {MODIFY_AI_DELETE_ASPECT $ally_side aggression set_by_ai_controller}
+                            {MODIFY_AI_DELETE_ASPECT $ally_side caution set_by_ai_controller}
 
                             {CLEAR_VARIABLE ai_controller.side_$ally_side|_current_settings.current_behaviour}
                         [/command]
@@ -656,10 +672,9 @@
                         [/show_if]
 
                         [command]
-                            [insert_tag]
-                                name=modify_side
-                                variable=ai_controller.side_$ally_side|_original_settings.ai_settings
-                            [/insert_tag]
+                            {MODIFY_AI_DELETE_GOAL $ally_side set_by_ai_controller}
+                            {MODIFY_AI_DELETE_ASPECT $ally_side aggression set_by_ai_controller}
+                            {MODIFY_AI_DELETE_ASPECT $ally_side caution set_by_ai_controller}
 
                             {CLEAR_VARIABLE ai_controller.side_$ally_side|_current_settings}
                         [/command]