diff --git a/mpq/scripts/iscript_terran.bin b/mpq/scripts/iscript_terran.bin
index 7519d060..387b3d0e 100644
Binary files a/mpq/scripts/iscript_terran.bin and b/mpq/scripts/iscript_terran.bin differ
diff --git a/mpq/scripts/iscript_terran.txt b/mpq/scripts/iscript_terran.txt
index 747fa75d..d4ac71fb 100644
--- a/mpq/scripts/iscript_terran.txt
+++ b/mpq/scripts/iscript_terran.txt
@@ -520,8 +520,8 @@ EidolonGndAttkInit:
 	wait              	1
 	playfram          	0x11
 	wait              	1
+	sigorder			32
 	playfram          	0x22
-	playsndbtwn			3602 3604 # Eidolon windup 01, 02, 03
 	wait				12
 EidolonGndAttkRpt:
 	wait              	1
@@ -691,11 +691,11 @@ IsId          	75
 Type          	12
 Init          	Goliath_Base_Init
 Death         	Goliath_Base_Death
-GndAttkInit   	[NONE]
-AirAttkInit   	[NONE]
+GndAttkInit   	SkryrokorLocal00
+AirAttkInit   	SkryrokorLocal00
 Unused1       	Goliath_Base_Unused1
-GndAttkRpt    	[NONE]
-AirAttkRpt    	[NONE]
+GndAttkRpt    	SkryrokorLocal00
+AirAttkRpt    	SkryrokorLocal00
 CastSpell     	[NONE]
 GndAttkToIdle 	[NONE]
 AirAttkToIdle 	[NONE]
@@ -796,8 +796,9 @@ Goliath_Turret_Init:
 	goto              	SkryrokorLocal00
 
 Goliath_Turret_GndAttkInit:
-	playsndbtwn			3201 3203 # Goliath windup 01, 02, 03
-	wait				5
+	wait				1
+	sigorder			32
+	wait				4
 Goliath_Turret_GndAttkRpt:
 	wait				1
 	nobrkcodestart
@@ -15720,7 +15721,7 @@ CyprianDeath:
 CyprianGndAttkInit:
 	playfram          	0x120
 	wait              	1
-	playsndbtwn			3626 3628 # Cyprian windup 01, 02, 03
+	sigorder			32
 	playfram          	0x140
 	wait              	1
 	playfram          	0x160
diff --git a/mpq/unit/wirefram/grpwire.grp b/mpq/unit/wirefram/grpwire.grp
index a50529f4..f4df33be 100644
Binary files a/mpq/unit/wirefram/grpwire.grp and b/mpq/unit/wirefram/grpwire.grp differ
diff --git a/mpq/unit/wirefram/wirefram.grp b/mpq/unit/wirefram/wirefram.grp
index 3d3f5639..501f1140 100644
Binary files a/mpq/unit/wirefram/wirefram.grp and b/mpq/unit/wirefram/wirefram.grp differ
diff --git a/patchnotes.md b/patchnotes.md
index 746bcf0c..6a6b6b39 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -12,6 +12,7 @@
 	- Made 'no corpse' behaviors spawn a consumed corpse for better visual feedback
 
 ## Terran
+- For units with windups, added a slight forgiveness period to allow more movement and retargeting
 - [Talos](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/talos):
 	- Vision range 8 » 7
 - [Cyprian](https://www.fraudsclub.com/cosmonarchy-bw/show.php?target=terran/cyprian):
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 10c30895..a0158cf0 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ