diff --git a/Loenn/entities/coreModeSpikes.lua b/Loenn/entities/coreModeSpikes.lua
index a46eafe..9bc6b08 100644
--- a/Loenn/entities/coreModeSpikes.lua
+++ b/Loenn/entities/coreModeSpikes.lua
@@ -1,9 +1,9 @@
 local spikeHelper = require("helpers.spikes")
 
-local spikeUp = spikeHelper.createEntityHandler("MaxHelpingHand/CoreModeSpikesUp", "up")
-local spikeDown = spikeHelper.createEntityHandler("MaxHelpingHand/CoreModeSpikesDown", "down")
-local spikeLeft = spikeHelper.createEntityHandler("MaxHelpingHand/CoreModeSpikesLeft", "left")
-local spikeRight = spikeHelper.createEntityHandler("MaxHelpingHand/CoreModeSpikesRight", "right")
+local spikeUp = spikeHelper.createEntityHandler("MaxHelpingHand/CoreModeSpikesUp", "up", {})
+local spikeDown = spikeHelper.createEntityHandler("MaxHelpingHand/CoreModeSpikesDown", "down", {})
+local spikeLeft = spikeHelper.createEntityHandler("MaxHelpingHand/CoreModeSpikesLeft", "left", {})
+local spikeRight = spikeHelper.createEntityHandler("MaxHelpingHand/CoreModeSpikesRight", "right", {})
 
 spikeUp.direction = "up"
 spikeDown.direction = "down"
diff --git a/Loenn/entities/groupedTriggerSpikes.lua b/Loenn/entities/groupedTriggerSpikes.lua
index 67b44af..5ae2593 100644
--- a/Loenn/entities/groupedTriggerSpikes.lua
+++ b/Loenn/entities/groupedTriggerSpikes.lua
@@ -8,25 +8,40 @@ local spikeVariants = {
     "dust"
 }
 
-local spikeUp = spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesUp", "up", false, true, spikeVariants)
-local spikeDown = spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesDown", "down", false, true, spikeVariants)
-local spikeLeft = spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesLeft", "left", false, true, spikeVariants)
-local spikeRight = spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesRight", "right", false, true, spikeVariants)
+local spikeOptions = {
+    triggerSpike = false,
+    originalTriggerSpike = true,
+    variants = spikeVariants
+}
+
+local spikeUp = spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesUp", "up", spikeOptions)
+local spikeDown = spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesDown", "down", spikeOptions)
+local spikeLeft = spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesLeft", "left", spikeOptions)
+local spikeRight = spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesRight", "right", spikeOptions)
 
 local allSpikes = { spikeUp, spikeDown, spikeLeft, spikeRight }
 
+local regularSpikeOptions = {
+    triggerSpike = false,
+    originalTriggerSpike = true
+}
+
 local regularSpikes = {
-    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesUp", "up", false, true),
-    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesDown", "down", false, true),
-    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesLeft", "left", false, true),
-    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesRight", "right", false, true)
+    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesUp", "up", regularSpikeOptions),
+    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesDown", "down", regularSpikeOptions),
+    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesLeft", "left", regularSpikeOptions),
+    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesRight", "right", regularSpikeOptions)
+}
+
+local dustSpikeOptions = {
+    triggerSpike = true
 }
 
 local dustSpikes = {
-    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesUp", "up", true),
-    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesDown", "down", true),
-    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesLeft", "left", true),
-    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesRight", "right", true)
+    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesUp", "up", dustSpikeOptions),
+    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesDown", "down", dustSpikeOptions),
+    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesLeft", "left", dustSpikeOptions),
+    spikeHelper.createEntityHandler("MaxHelpingHand/GroupedTriggerSpikesRight", "right", dustSpikeOptions)
 }
 
 -- pick between the dust handler and the regular handler depending on the entity type