diff --git a/data/campaigns/Eastern_Invasion/scenarios/03.An_Unexpected_Appearance.cfg b/data/campaigns/Eastern_Invasion/scenarios/03.An_Unexpected_Appearance.cfg
index cc679e95594..327b4a21e8c 100644
--- a/data/campaigns/Eastern_Invasion/scenarios/03.An_Unexpected_Appearance.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/03.An_Unexpected_Appearance.cfg
@@ -15,8 +15,7 @@
     [story]
         [part]
             show_title=yes
-            background="images/eastern-invasion-map.png"
-            {JOURNEY_PART1_STAGE_2}
+            {TO_AN_UNEXPECTED_APPEARANCE}
         [/part]
     [/story]
 
@@ -156,6 +155,10 @@
             speaker=Mal-Skraat
             message= _ "No! You have defeated me, and can re-enter Wesnoth!"
         [/message]
+        [set_variable]
+            name="first_fork"
+            value="west"
+        [/set_variable]
         [endlevel]
             result=victory
             next_scenario=Elven_Alliance
@@ -172,6 +175,10 @@
             speaker=Mal-Skraat
             message= _ "You have defeated my brother, but I will follow you and kill you!"
         [/message]
+        [set_variable]
+            name="first_fork"
+            value="east"
+        [/set_variable]
         [endlevel]
             result=victory
             next_scenario=Undead_Border_Patrol
diff --git a/data/campaigns/Eastern_Invasion/scenarios/04a.An_Elven_Alliance.cfg b/data/campaigns/Eastern_Invasion/scenarios/04a.An_Elven_Alliance.cfg
index 8eb33b57045..d83e7d70cb4 100644
--- a/data/campaigns/Eastern_Invasion/scenarios/04a.An_Elven_Alliance.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/04a.An_Elven_Alliance.cfg
@@ -18,9 +18,7 @@
         [/part]
         [part]
             show_title=yes
-            background="images/eastern-nvasion-map.png"
-            {JOURNEY_PART1_COMPLETE}
-            # FIXME: Need journey file for this stretch.
+            {TO_AN_ELVEN_ALLIANCE}
         [/part]
     [/story]
     [side]
diff --git a/data/campaigns/Eastern_Invasion/scenarios/04b.The_Undead_Border_Patrol.cfg b/data/campaigns/Eastern_Invasion/scenarios/04b.The_Undead_Border_Patrol.cfg
index f526484b57e..23eb6ae12ba 100644
--- a/data/campaigns/Eastern_Invasion/scenarios/04b.The_Undead_Border_Patrol.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/04b.The_Undead_Border_Patrol.cfg
@@ -11,6 +11,13 @@
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
+    [story]
+        [part]
+            show_title=yes
+            {TO_THE_UNDEAD_BORDER_PATROL}
+        [/part]
+    [/story]
+
     [side]
         race=Humans
         type=Lieutenant
@@ -122,7 +129,7 @@
         [/filter]
         [message]
             speaker=Dacyn
-            message= _ "We have defeated this patrol, but we can still turn back! Do we want to go further into these lands now, or do we want to try to turn back and defeat this dark sorcerer?"
+            message= _ "We have defeated this patrol, but we can still turn back! Do we want to go further east now, or do we want to try to turn back and defeat this dark sorcerer?"
         [/message]
         [message]
             speaker=Gweddry
diff --git a/data/campaigns/Eastern_Invasion/scenarios/04c.Mal-Ravanals_Capital.cfg b/data/campaigns/Eastern_Invasion/scenarios/04c.Mal-Ravanals_Capital.cfg
index 95deeb9158d..ac5607c4349 100644
--- a/data/campaigns/Eastern_Invasion/scenarios/04c.Mal-Ravanals_Capital.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/04c.Mal-Ravanals_Capital.cfg
@@ -21,6 +21,13 @@
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
+    [story]
+        [part]
+            show_title=yes
+            {TO_MAL_RAVANALS_CAPITOL}
+        [/part]
+    [/story]
+
     [side]
         type=Lieutenant
         id=Gweddry
@@ -111,7 +118,7 @@
         [/recall]
         [message]
             speaker=Gweddry
-            message= _ "We have come all the way to Mal-Ravanal's capital!"
+            message= _ "The Bitter Swamp's ill reputation is, it seems, well merited. Mal-Ravanal's capital lies before us!"
         [/message]
 
         [message]
@@ -127,7 +134,7 @@
         [message]
             speaker=Mal-Ravanal
             profile=portraits/mal-ravanal.png
-            message= _ "These humans have dared to come this far into my land. Crush them!"
+            message= _ "These humans have dared foolishly to come this far into my land. Crush them!"
         [/message]
         #there are 6 prisoner knights you can rescue
         [set_variable]
@@ -263,4 +270,13 @@
             bonus=yes
         [/endlevel]
     [/event]
+
+    [event]
+        name=victory
+        [message]
+            speaker=narrator
+            image=wesnoth-icon.png
+            message=_ "Gweddry's men retreated swiftly from the Bitter Swamp, fleeing north and west as if their heels were winged. Finding a low pass through the northern Estmarks, they were greatly relieved to see the valley of the Weldyn open before them on the other side."
+        [/message]
+    [/event]
 [/scenario]
diff --git a/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg b/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg
index 060ea8a9a6f..430198d1af9 100644
--- a/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg
@@ -12,6 +12,12 @@
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
+    [story]
+        [part]
+            {TO_NORTHERN_OUTPOST}
+        [/part]
+    [/story]
+
     [side]
         type=Lieutenant
         id=Gweddry
diff --git a/data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg b/data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg
index 8de32fbc262..35624ede9fc 100644
--- a/data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg
+++ b/data/campaigns/Eastern_Invasion/scenarios/06.Two_Paths.cfg
@@ -11,6 +11,12 @@
 
     {campaigns/Eastern_Invasion/utils/deaths.cfg}
 
+    [story]
+        [part]
+            {TO_TWO_PATHS}
+        [/part]
+    [/story]
+
     [side]
         type=Lieutenant
         id=Gweddry
@@ -131,8 +137,12 @@
         [/filter]
         [message]
             speaker=Wak-Rano
-            message= _ "No! These undead won our battle, and you will be able to enter my northern homeland!"
+            message= _ "Arrgh! I have failed to defend the northern homeland!"
         [/message]
+        [set_variable]
+            name="second_fork"
+            value="north"
+        [/set_variable]
         [endlevel]
             result=victory
             next_scenario=Crossing
@@ -149,6 +159,10 @@
             speaker=Mal-Arnai
             message= _ "I was supposed to kill you all! I have failed."
         [/message]
+        [set_variable]
+            name="second_fork"
+            value="west"
+        [/set_variable]
         [endlevel]
             result=victory
             next_scenario=Undead_Crossing
diff --git a/data/campaigns/Eastern_Invasion/utils/_final.cfg b/data/campaigns/Eastern_Invasion/utils/_final.cfg
new file mode 100644
index 00000000000..f39c06dadfd
--- /dev/null
+++ b/data/campaigns/Eastern_Invasion/utils/_final.cfg
@@ -0,0 +1,70 @@
+# wmllint: no translatables
+
+# This is where we stitch together the variant journey tracks.
+# How these are assembled depends on the value of the variables
+# first_fork and second_fork.
+
+#define TO_THE_OUTPOST
+    background="eastern-invasion-map.png"
+    {JOURNEY1_STAGE_1}
+#enddef
+
+#define TO_AN_UNEXPECTED_APPEARANCE
+    background="eastern-invasion-map.png"
+    {JOURNEY1_STAGE_2}
+#enddef
+
+#define TO_AN_ELVEN_ALLIANCE
+    background="eastern-invasion-map.png"
+    {JOURNEY1_COMPLETE}
+    {JOURNEY2_STAGE_1}
+#enddef
+
+#define TO_THE_UNDEAD_BORDER_PATROL
+    background="eastern-invasion-map.png"
+    {JOURNEY1_COMPLETE}
+    {JOURNEY3_STAGE_1}
+#enddef
+
+#define TO_MAL_RAVANALS_CAPITOL
+    background="eastern-invasion-map.png"
+    {JOURNEY1_COMPLETE}
+    {JOURNEY3_STAGE_2}
+#enddef
+
+#define TO_NORTHERN_OUTPOST
+    background="eastern-invasion-map.png"
+    {JOURNEY1_COMPLETE}
+    [switch]
+        variable=first_fork
+        [case]
+            value=west
+            {JOURNEY2_STAGE_2}
+        [/case]
+        [case]
+            value=east
+            {JOURNEY3_STAGE_3}
+        [/case]
+    [/switch]
+#enddef
+
+#define FROM_NORTHERN_OUTPOST
+    {JOURNEY1_COMPLETE}
+    [switch]
+        variable=first_fork
+        [case]
+            value=west
+            {JOURNEY2_COMPLETE}
+        [/case]
+        [case]
+            value=east
+            {JOURNEY3_COMPLETE}
+        [/case]
+    [/switch]
+#enddef
+
+#define TO_TWO_PATHS
+    background="eastern-invasion-map.png"
+    {FROM_NORTHERN_OUTPOST}
+    {JOURNEY4_STAGE_1}
+#enddef
diff --git a/data/campaigns/Eastern_Invasion/utils/intro.cfg b/data/campaigns/Eastern_Invasion/utils/intro.cfg
index 667bf87ca1e..17b67bd2b27 100644
--- a/data/campaigns/Eastern_Invasion/utils/intro.cfg
+++ b/data/campaigns/Eastern_Invasion/utils/intro.cfg
@@ -31,7 +31,6 @@
     [/part]
     [part]
         story= _ "All went well once the King's forces arrived. There were no attacks for several weeks, and Gweddry's men started to grow incautious. Then, at dawn one day, Gweddry and his men were roused by the startled cries of the night watchmen..."
-        background=eastern-invasion-map.png
-        {JOURNEY_PART1_STAGE_1}
+        {TO_THE_OUTPOST}
     [/part]
 [/story]
diff --git a/data/campaigns/Eastern_Invasion/utils/journey1.cfg b/data/campaigns/Eastern_Invasion/utils/journey1.cfg
index 7c5e762de5a..db6299308b2 100644
--- a/data/campaigns/Eastern_Invasion/utils/journey1.cfg
+++ b/data/campaigns/Eastern_Invasion/utils/journey1.cfg
@@ -2,20 +2,20 @@
 # Hand-hack strictly at your own risk
 #
 # trackplacer: map=data/campaigns/Eastern_Invasion/images/eastern-invasion-map.png
-# trackplacer: prefix=JOURNEY_PART1
+# trackplacer: prefix=JOURNEY1
 # wmllint: no translatables
 #
-#define JOURNEY_PART1_STAGE_1
+#define JOURNEY1_STAGE_1
     {NEW_BATTLE 759 508}
 #enddef
 
-#define JOURNEY_PART1_STAGE_2
+#define JOURNEY1_STAGE_2
     {OLD_BATTLE 759 508}
     {NEW_JOURNEY 788 509}
     {NEW_BATTLE 821 517}
 #enddef
 
-#define JOURNEY_PART1_COMPLETE
+#define JOURNEY1_COMPLETE
     {OLD_BATTLE 759 508}
     {OLD_JOURNEY 788 509}
     {OLD_BATTLE 821 517}
diff --git a/data/campaigns/Eastern_Invasion/utils/journey2.cfg b/data/campaigns/Eastern_Invasion/utils/journey2.cfg
new file mode 100644
index 00000000000..0831c8699d9
--- /dev/null
+++ b/data/campaigns/Eastern_Invasion/utils/journey2.cfg
@@ -0,0 +1,31 @@
+# Edited by trackplacer on Wed Oct 15 14:23:38 2008.
+# Hand-hack strictly at your own risk.
+#
+# trackplacer: map=data/campaigns/Eastern_Invasion/images/eastern-invasion-map.png
+# trackplacer: prefix=JOURNEY2
+# wmllint: no translatables
+#
+#define JOURNEY2_STAGE_1
+    {NEW_JOURNEY 844 507}
+    {NEW_JOURNEY 847 487}
+    {NEW_BATTLE 847 469}
+#enddef
+
+#define JOURNEY2_STAGE_2
+    {OLD_JOURNEY 844 507}
+    {OLD_JOURNEY 847 487}
+    {OLD_BATTLE 847 469}
+    {NEW_JOURNEY 798 466}
+    {NEW_JOURNEY 772 471}
+    {NEW_BATTLE 729 460}
+#enddef
+
+#define JOURNEY2_COMPLETE
+    {OLD_JOURNEY 844 507}
+    {OLD_JOURNEY 847 487}
+    {OLD_BATTLE 847 469}
+    {OLD_JOURNEY 798 466}
+    {OLD_JOURNEY 772 471}
+    {OLD_BATTLE 729 460}
+#enddef
+
diff --git a/data/campaigns/Eastern_Invasion/utils/journey3.cfg b/data/campaigns/Eastern_Invasion/utils/journey3.cfg
new file mode 100644
index 00000000000..2654cc78ebc
--- /dev/null
+++ b/data/campaigns/Eastern_Invasion/utils/journey3.cfg
@@ -0,0 +1,57 @@
+# Edited by trackplacer on Wed Oct 15 13:29:15 2008.
+# Hand-hack strictly at your own risk.
+#
+# trackplacer: map=/home/esr/svn/wesnoth/data/campaigns/Eastern_Invasion/images/eastern-invasion-map.png
+# trackplacer: prefix=JOURNEY3
+# wmllint: no translatables
+#
+#define JOURNEY3_STAGE_1
+    {NEW_JOURNEY 846 525}
+    {NEW_JOURNEY 879 545}
+    {NEW_JOURNEY 908 562}
+    {NEW_BATTLE 938 583}
+#enddef
+
+#define JOURNEY3_STAGE_2
+    {OLD_JOURNEY 846 525}
+    {OLD_JOURNEY 879 545}
+    {OLD_JOURNEY 908 562}
+    {OLD_BATTLE 938 583}
+    {NEW_JOURNEY 951 538}
+    {NEW_JOURNEY 984 568}
+    {NEW_JOURNEY 959 598}
+    {NEW_BATTLE 988 611}
+#enddef
+
+#define JOURNEY3_STAGE_3
+    {OLD_JOURNEY 846 525}
+    {OLD_JOURNEY 879 545}
+    {OLD_JOURNEY 908 562}
+    {OLD_BATTLE 938 583}
+    {OLD_JOURNEY 951 538}
+    {OLD_JOURNEY 984 568}
+    {OLD_JOURNEY 959 598}
+    {OLD_BATTLE 988 611}
+    {NEW_JOURNEY 932 503}
+    {NEW_JOURNEY 876 475}
+    {NEW_JOURNEY 831 467}
+    {NEW_JOURNEY 781 469}
+    {NEW_BATTLE 729 460}
+#enddef
+
+#define JOURNEY3_COMPLETE
+    {OLD_JOURNEY 846 525}
+    {OLD_JOURNEY 879 545}
+    {OLD_JOURNEY 908 562}
+    {OLD_BATTLE 938 583}
+    {OLD_JOURNEY 951 538}
+    {OLD_JOURNEY 984 568}
+    {OLD_JOURNEY 959 598}
+    {OLD_BATTLE 988 611}
+    {OLD_JOURNEY 932 503}
+    {OLD_JOURNEY 876 475}
+    {OLD_JOURNEY 831 467}
+    {OLD_JOURNEY 781 469}
+    {OLD_BATTLE 729 460}
+#enddef
+
diff --git a/data/campaigns/Eastern_Invasion/utils/journey4.cfg b/data/campaigns/Eastern_Invasion/utils/journey4.cfg
new file mode 100644
index 00000000000..1de78579c3d
--- /dev/null
+++ b/data/campaigns/Eastern_Invasion/utils/journey4.cfg
@@ -0,0 +1,17 @@
+# Edited by trackplacer on Wed Oct 15 14:33:56 2008.
+# Hand-hack strictly at your own risk.
+#
+# trackplacer: map=/home/esr/svn/wesnoth/data/campaigns/Eastern_Invasion/images/eastern-invasion-map.png
+# trackplacer: prefix=JOURNEY4
+# wmllint: no translatables
+#
+#define JOURNEY4_STAGE_1
+    {NEW_JOURNEY 709 449}
+    {NEW_BATTLE 709 412}
+#enddef
+
+#define JOURNEY4_COMPLETE
+    {OLD_JOURNEY 709 449}
+    {OLD_BATTLE 709 412}
+#enddef
+
diff --git a/data/tools/trackplacer b/data/tools/trackplacer
index 04bb218e627..0f2d2c99851 100755
--- a/data/tools/trackplacer
+++ b/data/tools/trackplacer
@@ -606,7 +606,7 @@ class TrackEditor:
                 filename = filename[len(os.getcwd())+1:]
 
             # Request overwrite confirmation if this is a save-as
-            if filename != self.last_read:
+            if os.path.exists(filename) and filename != self.last_read:
                 save_check = gtk.Dialog(title="Really overwrite?",
                                              parent=None, 
                                              flags=gtk.DIALOG_MODAL,