diff --git a/mpq/scripts/iscript.txt b/mpq/scripts/iscript.txt
index 3e25ebea..b065e7ce 100644
--- a/mpq/scripts/iscript.txt
+++ b/mpq/scripts/iscript.txt
@@ -5698,14 +5698,14 @@ IsWorking     	[NONE]
 WorkingToIdle 	[NONE]
 WarpIn        	[NONE]
 Unused3       	[NONE]
-StarEditInit  	Goliath_Base_StarEditInit
+StarEditInit  	[NONE]
 .headerend
 # ----------------------------------------------------------------------------- #
 
 Goliath_Base_Init:
 	imgul             	236 0 0 # Goliath Shadow (terran\tgoShad.grp)
 Goliath_Base_WalkingToIdle:
-	playfram          	0x77
+	playfram          	0x00
 	goto              	Goliath_Base_Local00
 
 Goliath_Base_Local00:
@@ -5730,15 +5730,18 @@ Goliath_Base_Unused1:
 	goto				Goliath_Base_WalkingToIdle
 
 Goliath_Base_Walking:
-	move              	5
-	wait              	1
-	playfram          	0x88
 	move              	5
 	wait              	1
 	playfram          	0x99
 	move              	5
 	wait              	1
-	playfram          	0x00
+	playfram          	0xaa
+	move              	5
+	wait              	1
+	playfram          	0xbb
+	move              	5
+	wait              	1
+	playfram          	0xcc
 	move              	5
 	wait              	1
 	playfram          	0x11
@@ -5760,14 +5763,11 @@ Goliath_Base_Walking:
 	move              	5
 	wait              	1
 	playfram          	0x77
+	move              	5
+	wait              	1
+	playfram          	0x88
 	goto              	Goliath_Base_Walking
 
-Goliath_Base_StarEditInit:
-	imgol             	235 0 0	# Goliath Turret (terran\goliathT.grp)
-	imgul             	236 0 0	# Goliath Shadow (terran\tgoShad.grp)
-	playfram          	0x77	# Frame set 7
-	goto              	Goliath_Base_Local00
-
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
 # 235 Goliath Turret (terran\goliathT.grp)
@@ -5792,22 +5792,22 @@ SpecialState1 	[NONE]
 # ----------------------------------------------------------------------------- #
 
 Goliath_Turret_Init:
-	playfram          	0x77
+	playfram          	0x00
 	goto              	InfestedTerranLocal00
 
 Goliath_Turret_GndAttkInit:
-	playfram          	0xaa
+	playfram          	0xdd
 	playsnd           	70 # Bullet\TGoFir00.wav
 	attackwith        	1
 	wait              	1
 	nobrkcodestart
-	playfram          	0x77
+	playfram          	0x00
 	wait              	1
-	playfram          	0xaa
+	playfram          	0xdd
 	wait              	1
-	playfram          	0x77
+	playfram          	0x00
 	wait              	1
-	playfram          	0xaa
+	playfram          	0xdd
 	wait              	1
 	nobrkcodeend
 	gotorepeatattk
@@ -5821,15 +5821,18 @@ Goliath_Turret_AirAttkInit:
 	goto              	Goliath_Turret_Init
 
 Goliath_Turret_Walking:
-	move              	0
-	wait              	1
-	playfram          	0x88
 	move              	0
 	wait              	1
 	playfram          	0x99
 	move              	0
 	wait              	1
-	playfram          	0x00
+	playfram          	0xaa
+	move              	0
+	wait              	1
+	playfram          	0xbb
+	move              	0
+	wait              	1
+	playfram          	0xcc
 	move              	0
 	wait              	1
 	playfram          	0x11
@@ -5851,8 +5854,12 @@ Goliath_Turret_Walking:
 	move              	0
 	wait              	1
 	playfram          	0x77
+	move              	0
+	wait              	1
+	playfram          	0x88
 	goto              	Goliath_Turret_Walking
 
+
 # ----------------------------------------------------------------------------- #
 # This header is used by images.dat entries:
 # 237 Sarah Kerrigan (terran\ughost.grp)
diff --git a/mpq/unit/terran/goliath.grp b/mpq/unit/terran/goliath.grp
index 214eea34..52debeda 100644
Binary files a/mpq/unit/terran/goliath.grp and b/mpq/unit/terran/goliath.grp differ
diff --git a/mpq/unit/terran/goliath.lol b/mpq/unit/terran/goliath.lol
new file mode 100644
index 00000000..21a7135c
Binary files /dev/null and b/mpq/unit/terran/goliath.lol differ
diff --git a/mpq/unit/terran/goliathT.grp b/mpq/unit/terran/goliathT.grp
index 7ab5383e..a27fb76d 100644
Binary files a/mpq/unit/terran/goliathT.grp and b/mpq/unit/terran/goliathT.grp differ
diff --git a/mpq/unit/terran/tgoShad.grp b/mpq/unit/terran/tgoShad.grp
index 670ef7fd..f1336981 100644
Binary files a/mpq/unit/terran/tgoShad.grp and b/mpq/unit/terran/tgoShad.grp differ
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 95ecb44c..7d78eb95 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ