diff --git a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
index 30ac95bb7454..ec158cee83a1 100644
--- a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
+++ b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
@@ -730,93 +730,81 @@
         {TALK_ABOUT Thrag (_"You are close to killing their leader! The unit who finishes him will gain 16 experience points because he is second level. Choose your attacking unit carefully!")}
     [/event]
 
+    # Any level unit near advancement
     [event]
         name=die
-        first_time_only=no
         [filter]
             side=1
-            [and]
-                type=Elvish Fighter
-                [or]
-                    type=Elvish Archer
-                [/or]
-            [/and]
+            race=elf
         [/filter]
+        [filter_condition]
+            [variable]
+                name=unit.experience
+                greater_than=$($unit.max_experience-13)
+            [/variable]
+        [/filter_condition]
 
         [if]
             [variable]
-                name=unit.experience
-                greater_than=20
+                name=unit.gender
+                equals=male
             [/variable]
             [then]
-                [if]
-                    [variable]
-                        name=unit.gender
-                        equals=male
-                    [/variable]
-                    [then]
-                        [message]
-                            speaker=Galdrad
-                            message= _ "We will miss $unit.name| because he had $unit.experience experience points. He would have advanced to second level soon."
-                        [/message]
-                    [/then]
-                    [else]
-                        [message]
-                            speaker=Galdrad
-                            message= _ "We will miss $unit.name| because she had $unit.experience experience points. She would have advanced to second level soon."
-                        [/message]
-                    [/else]
-                [/if]
+                [message]
+                    speaker=Galdrad
+                    message= _ "We will miss $unit.name| because he had $unit.experience experience points. He would have advanced a level soon."
+                [/message]
             [/then]
-            [elseif]
-                [variable]
-                    name=unit.experience
-                    less_than=8
-                [/variable]
-                [then]
-                    [if]
-                        [variable]
-                            name=unit.gender
-                            equals=male
-                        [/variable]
-                        [then]
-                            [message]
-                                speaker=Galdrad
-                                message= _ "We will miss $unit.name|, but at least he was not one of our experienced troops!"
-                            [/message]
-                        [/then]
-                        [else]
-                            [message]
-                                speaker=Galdrad
-                                message= _ "We will miss $unit.name|, but at least she was not one of our experienced troops!"
-                            [/message]
-                        [/else]
-                    [/if]
-                [/then]
-            [/elseif]
+            [else]
+                [message]
+                    speaker=Galdrad
+                    message= _ "We will miss $unit.name| because she had $unit.experience experience points. She would have advanced a level soon."
+                [/message]
+            [/else]
         [/if]
     [/event]
 
+    # Level 1 units, not shamans, not near advancement. Shamans have their own death dialog
     [event]
         name=die
         [filter]
             side=1
-            type=Elvish Shaman
+            race=elf
+            type=Elvish Fighter, Elvish Archer
         [/filter]
+        [filter_condition]
+            [variable]
+                name=unit.experience
+                less_than=10
+            [/variable]
+        [/filter_condition]
 
-        [message]
-            speaker=Galdrad
-            message= _ "Losing a healer hurts all the troops! Keep them out of the enemy’s reach!"
-        [/message]
-
-        # TODO: Move?
-        {NARRATOR _"Tracking Enemy Movement" _"You can see where an enemy can reach by moving the mouse over them. You can see all possible enemy moves at once with the <b>Show Enemy Moves</b> command from the <b>Actions</b> menu."}
+        [if]
+            [variable]
+                name=unit.gender
+                equals=male
+            [/variable]
+            [then]
+                [message]
+                    speaker=Galdrad
+                    message= _ "We will miss $unit.name|, but at least he was not one of our experienced troops!"
+                [/message]
+            [/then]
+            [else]
+                [message]
+                    speaker=Galdrad
+                    message= _ "We will miss $unit.name|, but at least she was not one of our experienced troops!"
+                [/message]
+            [/else]
+        [/if]
     [/event]
 
+    # Level 2 and up units, any type
     [event]
         name=die
         [filter]
             side=1
+            race=elf
             level=2
             [or]
                 level=3
@@ -825,10 +813,26 @@
 
         [message]
             speaker=Galdrad
-            message= _ "Higher level units are powerful, but not invulnerable! Goodbye, $unit.name|."
+            message= _ "Higher level units are powerful, but not invulnerable. Goodbye, $unit.name|."
         [/message]
     [/event]
 
+    # Death of the shaman or any of her advancements
+    [event]
+        name=die
+        [filter]
+            side=1
+            type=Elvish Shaman,Elvish Druid,Elvish Shyde,Elvish Sorceress,Elvish Enchantress
+        [/filter]
+
+        [message]
+            speaker=Galdrad
+            message= _ "Losing a healer hurts all the troops! Keep them out of the enemy’s reach!"
+        [/message]
+
+        {NARRATOR _"Tracking Enemy Movement" _"You can see where an enemy can reach by moving the mouse over them. You can see all possible enemy moves at once with the <b>Show Enemy Moves</b> command from the <b>Actions</b> menu."}
+    [/event]
+
     [event]
         name=moveto
         [filter]