diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index 99747eef..46ca43fc 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -11175,10 +11175,10 @@ IsId          	158
 Type          	21
 Init          	CantavisInit
 Death         	CantavisDeath
-GndAttkInit   	CantavisGndAttkInit
+GndAttkInit   	[NONE]
 AirAttkInit   	[NONE]
 Unused1       	CantavisUnused1
-GndAttkRpt    	CantavisGndAttkInit
+GndAttkRpt    	[NONE]
 AirAttkRpt    	[NONE]
 CastSpell     	CantavisCastSpell
 GndAttkToIdle 	CantavisGndAttkToIdle
@@ -11263,28 +11263,50 @@ CantavisUnused1:
 	nobrkcodeend
 	goto				CantavisWalkingToIdle
 
-CantavisGndAttkInit:
-	playsnd           	101	# Bullet\LaserB.wav
+CantavisCastSpell:
 	playfram          	0x00
-	wait              	1
 	nobrkcodestart
+	playsnd				2547 # Psionic Storm cast 01
+	wait              	1
 	playfram          	0x11
 	wait              	1
 	playfram          	0x22
 	wait              	1
 	playfram          	0x33
 	wait              	1
-	attackwith        	1
 	playfram          	0x44
 	wait              	1
-	nobrkcodeend
-	gotorepeatattk
-	playfram          	0x66
-	goto              	InfestedTerranLocal00
-
-CantavisCastSpell:
-	playfram          	0x00
-	nobrkcodestart
+	playfram          	0x11
+	wait              	1
+	playfram          	0x22
+	wait              	1
+	playfram          	0x33
+	wait              	1
+	playfram          	0x44
+	wait              	1
+	playfram          	0x11
+	wait              	1
+	playfram          	0x22
+	wait              	1
+	playfram          	0x33
+	wait              	1
+	playfram          	0x44
+	wait              	1
+	playfram          	0x11
+	wait              	1
+	playfram          	0x22
+	wait              	1
+	playfram          	0x33
+	wait              	1
+	playfram          	0x44
+	wait              	1
+	playfram          	0x11
+	wait              	1
+	playfram          	0x22
+	wait              	1
+	playfram          	0x33
+	wait              	1
+	playfram          	0x44
 	wait              	1
 	playfram          	0x11
 	wait              	1
diff --git a/mpq/sound/cm/p/cantavis/psi-cast-01.wav b/mpq/sound/cm/p/cantavis/psi-cast-01.wav
new file mode 100644
index 00000000..5346ec7e
Binary files /dev/null and b/mpq/sound/cm/p/cantavis/psi-cast-01.wav differ
diff --git a/mpq/sound/protoss/templar/ptesto00.wav b/mpq/sound/protoss/templar/ptesto00.wav
new file mode 100644
index 00000000..840105fa
Binary files /dev/null and b/mpq/sound/protoss/templar/ptesto00.wav differ
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 46f7e999..4470bc2a 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ