diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/A_Final_Spring.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/A_Final_Spring.cfg
index 06e4d758109..87b55101699 100644
--- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/A_Final_Spring.cfg
+++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/A_Final_Spring.cfg
@@ -130,7 +130,7 @@
 		user_description= _ "Tan-Gulo"
 		side=5
 		canrecruit=1
-		recruit=Sea Orc, Vampire Bat
+		recruit=Naga Fighter,Vampire Bat
 		{GOLD 180 220 260}
 		team_name=orcs
 		[ai]
diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/Clearwater_Port.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/Clearwater_Port.cfg
index dc99177a27a..941748ba452 100644
--- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/Clearwater_Port.cfg
+++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/Clearwater_Port.cfg
@@ -382,22 +382,22 @@
 		[/message]
 		
 		[allow_recruit]
-			type=Sea Orc
+			type=Naga Fighter
 			side=3
 		[/allow_recruit]
 
 #ifdef EASY
-		{UNIT (Sea Orc) (Rolo) ( _ "Rolo") 3 31 30}
+		{UNIT (Naga Fighter) (Rolassi) ( _ "Rolassi") 3 31 30}
 #endif
 #ifdef NORMAL
-		{UNIT (Sea Orc) (Rolo) ( _ "Rolo") 3 31 30}
-		{UNIT (Sea Orc) (Porbag) ( _ "Porbag") 3 30 31}
+		{UNIT (Naga Fighter) (Rolassi) ( _ "Rolassi") 3 31 30}
+		{UNIT (Naga Fighter) (Porbag) ( _ "Porbag") 3 30 31}
 #endif
 
 #ifdef HARD
-		{UNIT (Sea Orc) (Rolo) ( _ "Rolo") 3 31 30}
-		{UNIT (Sea Orc) (Porbag) ( _ "Porbag") 3 30 31}
-		{UNIT (Sea Orc) (Eriol) ( _ "Eriol") 3 27 33}
+		{UNIT (Naga Fighter) (Rolassi) ( _ "Rolassi") 3 31 30}
+		{UNIT (Naga Fighter) (Porbag) ( _ "Porbag") 3 30 31}
+		{UNIT (Naga Fighter) (Eriol) ( _ "Eriol") 3 27 33}
 #endif
 
 	[/event]
diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/Rise_of_Wesnoth.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/Rise_of_Wesnoth.cfg
index 260885ca553..89cdde142e0 100644
--- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/Rise_of_Wesnoth.cfg
+++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/Rise_of_Wesnoth.cfg
@@ -89,7 +89,7 @@
 		user_description= _ "Tan-Vragish"
 		side=3
 		canrecruit=1
-		recruit=Sea Orc, Vampire Bat
+		recruit=Naga Fighter,Vampire Bat
 		{GOLD 130 150 180}
 		team_name=orcs
 		[ai]
diff --git a/data/tutorial/units/Elder_Mage.cfg b/data/tutorial/units/Elder_Mage.cfg
new file mode 100644
index 00000000000..f4a1b5c2da4
--- /dev/null
+++ b/data/tutorial/units/Elder_Mage.cfg
@@ -0,0 +1,77 @@
+[unit]
+id=Elder Mage
+name= _ "Elder Mage"
+race=human
+image="units/elder-mage.png"
+[defend]
+[frame]
+begin=-150
+end=150
+image="units/elder-mage-defend.png"
+[/frame]
+[/defend]
+profile=portraits/delfador.png
+hitpoints=55
+movement_type=smallfoot
+	[resistance]
+	fire=80
+	[/resistance]
+movement=6
+experience=100
+level=5
+alignment=neutral
+advanceto=null
+{AMLA_TOUGH 3}
+cost=65
+usage=mixed fighter
+get_hit_sound=groan.wav
+unit_description= _ "Once great, Elder Magi have seen their power a little diminished from wearying years of battle. Nevertheless they remain feared on the battlefield on account of their powerful lightning bolts."
+	[attack]
+	name=staff
+	type=impact
+	range=melee
+	damage=8
+	number=2
+		[animation]
+		[sound]
+		time=-100
+		sound=staff.wav
+		[/sound]
+		[frame]
+		begin=-100
+		end=100
+		image="units/elder-mage-attack.png"
+		[/frame]
+		[/animation]
+	[/attack]
+	[attack]
+	name=lightning
+	type=fire
+	range=ranged
+	special=magical
+	damage=14
+	number=4
+	icon=attacks/lightingbolt.png
+		[animation]
+		[frame]
+		begin=-600
+		end=0
+		image="units/elder-mage-ranged.png"
+		halo=halo/elder-mage-halo1.png:100,halo/elder-mage-halo2.png:100,halo/elder-mage-halo3.png:100,halo/elder-mage-halo4.png:100,halo/elder-mage-halo5.png:100,halo/elder-mage-halo6.png:100
+		halo_x,halo_y=13,-376
+		[/frame]
+		[sound]
+		time=-200
+		sound=lightning.wav
+		[/sound]
+		[missile_frame]
+		begin=-100
+		end=0
+		image="projectiles/lightning-n.png"
+		image_diagonal="projectiles/lightning-ne.png"
+#		halo=halo/elder-mage-halo7.png
+#		halo_x,halo_y=13,-26
+		[/missile_frame]
+		[/animation]
+	[/attack]
+[/unit]
diff --git a/data/tutorial/units/Youth.cfg b/data/tutorial/units/Youth.cfg
new file mode 100644
index 00000000000..ef158a9b62b
--- /dev/null
+++ b/data/tutorial/units/Youth.cfg
@@ -0,0 +1,50 @@
+[unit]
+id=Youth
+name= _ "Youth"
+race=human
+image="konrad-young.png"
+[defend]
+[frame]
+begin=-150
+end=150
+image="konrad-young-defend.png"
+[/frame]
+[/defend]
+profile=portraits/konrad.png
+hitpoints=20
+movement_type=smallfoot
+movement=4
+experience=8
+level=0
+alignment=neutral
+advanceto=Fighter
+cost=8
+usage=mixed fighter
+unit_description= _ "Today almost a boy, by his devotion to the crown he is seeking to become a Lord -- to join the elite of human fighters."
+get_hit_sound=groan.wav
+	[attack]
+	name=training sword
+	icon=attacks/woodensword.png
+	type=impact
+	range=melee
+	damage=3
+	number=2
+		[animation]
+		[frame]
+		begin=-250
+		end=-100
+		image="konrad-young.png"
+		[/frame]
+		[frame]
+		begin=-100
+		end=50
+		image=""konrad-young-attack.png""
+		[/frame]
+
+		[sound]
+		time=-250
+		sound=sword-swish.wav
+		[/sound]
+		[/animation]
+	[/attack]
+[/unit]