diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/act_button/touch.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/act_button/touch.mcfunction
index e61de39cc..e6e14454e 100644
--- a/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/act_button/touch.mcfunction
+++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/act_button/touch.mcfunction
@@ -1,3 +1,5 @@
+function omegaflowey.main:telemetry/tag/instant { name: "soul_event_touch" }
+
 # Update state flag
 scoreboard players set #omegaflowey.soul.5.touched omegaflowey.soul.flag 1
 
diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/executor/initialize/saved.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/executor/initialize/saved.mcfunction
index c260f491c..eec0c02dc 100644
--- a/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/executor/initialize/saved.mcfunction
+++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/executor/initialize/saved.mcfunction
@@ -1,3 +1,5 @@
+function omegaflowey.main:telemetry/tag/instant { name: "soul_event_saved" }
+
 # Update state flag
 scoreboard players set #omegaflowey.soul.5.saved omegaflowey.soul.flag 1
 
diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/executor/loop/saved.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/executor/loop/saved.mcfunction
index 8189d0005..a80db3e4a 100644
--- a/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/executor/loop/saved.mcfunction
+++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/executor/loop/saved.mcfunction
@@ -2,6 +2,9 @@ scoreboard players operation @s omegaflowey.math.0 = @s omegaflowey.soul.clock.i
 scoreboard players operation @s omegaflowey.math.0 -= @s omegaflowey.soul.clock.touched_act_button
 
 # omegaflowey.math.0 = how many ticks after the player grabbed the ACT button
-execute if score @s omegaflowey.math.0 matches 120 run function omegaflowey.entity:soul/soul_5/executor/initialize/before_saved with storage omegaflowey:soul.5
-execute if score @s omegaflowey.math.0 matches 153 run function omegaflowey.entity:soul/soul_5/executor/initialize/saved with storage omegaflowey:soul.5
-execute if score @s omegaflowey.math.0 matches 253.. run function omegaflowey.entity:soul/soul_5/executor/terminate with storage omegaflowey:bossfight
+execute if score @s omegaflowey.math.0 matches 120 run return run \
+  function omegaflowey.entity:soul/soul_5/executor/initialize/before_saved with storage omegaflowey:soul.5
+execute if score @s omegaflowey.math.0 matches 153 run return run \
+  function omegaflowey.entity:soul/soul_5/executor/initialize/saved with storage omegaflowey:soul.5
+execute if score @s omegaflowey.math.0 matches 253.. run return run \
+  function omegaflowey.entity:soul/soul_5/executor/terminate with storage omegaflowey:bossfight
diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/tag/instant.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/tag/instant.mcfunction
new file mode 100644
index 000000000..2c5b8328e
--- /dev/null
+++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/tag/instant.mcfunction
@@ -0,0 +1,4 @@
+execute if score #omegaflowey.telemetry.basetime omegaflowey.global.flag matches -1 run return 0
+
+$data modify storage omegaflowey:telemetry tags[-1] append value { name: "$(name)", type: "instant" }
+function omegaflowey.main:telemetry/tag/shared