diff --git a/lua/dottweakdata.lua b/lua/dottweakdata.lua
new file mode 100644
index 0000000..5935cee
--- /dev/null
+++ b/lua/dottweakdata.lua
@@ -0,0 +1,15 @@
+-- rework poison cloud DOT
+Hooks:PostHook(DOTTweakData, "init", "eclipse_init", function (self)
+	self.dot_entries.poison.proj_gas_grenade_cloud.hurt_animation_chance = 1
+	self.dot_entries.poison.proj_gas_grenade_cloud.dot_damage = 8
+	self.dot_entries.poison.proj_gas_grenade_cloud.dot_tick_period = 2
+	self.dot_entries.poison.proj_gas_grenade_cloud.dot_length = 10
+	self.dot_entries.poison.proj_launcher_cloud.hurt_animation_chance = 0.3
+	self.dot_entries.poison.proj_launcher_cloud.dot_damage = 4
+	self.dot_entries.poison.proj_launcher_cloud.dot_tick_period = 2
+	self.dot_entries.poison.proj_launcher_cloud.dot_length = 10
+	self.dot_entries.poison.proj_launcher_arbiter_cloud.hurt_animation_chance = 0.3
+	self.dot_entries.poison.proj_launcher_arbiter_cloud.dot_damage = 4
+	self.dot_entries.poison.proj_launcher_arbiter_cloud.dot_tick_period = 2
+	self.dot_entries.poison.proj_launcher_arbiter_cloud.dot_length = 10
+end)
diff --git a/lua/firetweakdata.lua b/lua/firetweakdata.lua
new file mode 100644
index 0000000..b4a52ff
--- /dev/null
+++ b/lua/firetweakdata.lua
@@ -0,0 +1,25 @@
+Hooks:PostHook(FireTweakData, "_init_dot_entries_fire", "eclipse__init_dot_entries_fire", function(self, fire_entries)
+    -- incendiary
+    fire_entries.proj_fire_com.dot_damage = 30
+    fire_entries.proj_fire_com.dot_length = 5
+
+    -- flamer dot (might just rework later)
+	fire_entries.weapon_flamethrower_mk2 = {
+        dot_trigger_chance = 50,
+        dot_damage = 7.5,
+        dot_length = 1.1,
+        dot_tick_period = 0.5,
+        dot_trigger_max_distance = false
+	}
+	fire_entries.ammo_flamethrower_mk2_rare = deep_clone(fire_entries.weapon_flamethrower_mk2)
+	fire_entries.ammo_flamethrower_mk2_welldone = deep_clone(fire_entries.weapon_flamethrower_mk2)
+
+    -- db dot (might rework too)
+	fire_entries.ammo_dragons_breath = {
+		dot_trigger_chance = 1,
+		dot_damage = 3,
+		dot_length = 4,
+		dot_trigger_max_distance = 1500,
+        dot_tick_period = 0.25
+	}
+end)
\ No newline at end of file
diff --git a/lua/tweakdata.lua b/lua/tweakdata.lua
index 22bffc9..a47b1a7 100644
--- a/lua/tweakdata.lua
+++ b/lua/tweakdata.lua
@@ -93,9 +93,9 @@ tweak_data.projectiles.underbarrel_electric_groza.damage = 10
 tweak_data.projectiles.launcher_electric_ms3gl.damage = 10
 
 -- incendiary buff
--- tweak_data.projectiles.fir_com.damage = 10
-tweak_data.projectiles.fir_com.fire_dot_data.dot_damage = 30
+tweak_data.projectiles.fir_com.damage = 10
 tweak_data.projectiles.fir_com.range = 800
+
 -- frags buff
 tweak_data.projectiles.frag.damage = 200
 tweak_data.projectiles.frag_com.damage = 200
@@ -103,17 +103,12 @@ tweak_data.projectiles.dada_com.damage = 200
 tweak_data.projectiles.dynamite.damage = 200
 
 -- poison nerf
--- tweak_data.projectiles.poison_gas_grenade.poison_gas_dot_data.hurt_animation_chance = 1
--- tweak_data.projectiles.poison_gas_grenade.poison_gas_dot_data.dot_damage = 8
--- tweak_data.projectiles.poison_gas_grenade.poison_gas_dot_data.dot_tick_period = 2
--- tweak_data.projectiles.poison_gas_grenade.poison_gas_dot_data.dot_length = 10
 tweak_data.projectiles.poison_gas_grenade.poison_gas_range = 400
 tweak_data.projectiles.poison_gas_grenade.poison_gas_duration = 10
 
 tweak_data.projectiles.launcher_poison.damage = 9
 tweak_data.projectiles.launcher_poison.poison_gas_range = 300
 tweak_data.projectiles.launcher_poison.poison_gas_duration = 10
-tweak_data.projectiles.launcher_poison.poison_gas_dot_data = { hurt_animation_chance = 0.3, dot_damage = 4, dot_length = 10, dot_tick_period = 2 }
 tweak_data.projectiles.launcher_poison_gre_m79 = deep_clone(tweak_data.projectiles.launcher_poison)
 tweak_data.projectiles.launcher_poison_gre_m79.damage = 9
 tweak_data.projectiles.launcher_poison_gre_m79.poison_gas_range = 300
diff --git a/lua/weaponfactorytweakdata.lua b/lua/weaponfactorytweakdata.lua
index 9697de9..927f8d6 100644
--- a/lua/weaponfactorytweakdata.lua
+++ b/lua/weaponfactorytweakdata.lua
@@ -25,7 +25,6 @@ Hooks:PostHook(WeaponFactoryTweakData, "init", "eclipse__init", function(self)
 	self.parts.wpn_fps_upg_a_dragons_breath.stats.total_ammo_mod = -8
 	self.parts.wpn_fps_upg_a_dragons_breath.custom_stats.ammo_pickup_max_mul = 0.85
 	self.parts.wpn_fps_upg_a_dragons_breath.custom_stats.ammo_pickup_min_mul = 0.85
-	self.parts.wpn_fps_upg_a_dragons_breath.custom_stats.fire_dot_data = { dot_trigger_chance = "100", dot_damage = "3", dot_length = "4", dot_trigger_max_distance = "1500", dot_tick_period = "0.25" }
 	-- Shell Rack for loco and r880
 	self.parts.wpn_fps_shot_r870_body_rack.stats.reload = 2
 	self.parts.wpn_fps_shot_r870_body_rack.stats.total_ammo_mod = 0
diff --git a/lua/weapontweakdata.lua b/lua/weapontweakdata.lua
index f67e8a8..de25af5 100644
--- a/lua/weapontweakdata.lua
+++ b/lua/weapontweakdata.lua
@@ -1658,13 +1658,6 @@ self.x_judge.damage_falloff = FALLOFF_TEMPLATE.SHOTGUN_FALL_HIGH
 
 -- mk2
 self.flamethrower_mk2.stats.damage = 25
-self.flamethrower_mk2.fire_dot_data = {
-	dot_trigger_chance = 50,
-	dot_damage = 7.5,
-	dot_length = 1.1,
-	dot_trigger_max_distance = 3000,
-	dot_tick_period = 0.5
-}
 self.flamethrower_mk2.AMMO_PICKUP = {2.65, 3.5}
 
 
diff --git a/supermod.xml b/supermod.xml
index 2e27228..5f0c6ad 100644
--- a/supermod.xml
+++ b/supermod.xml
@@ -74,6 +74,8 @@
 				<post :hook_id="blackmarket/meleeweaponstweakdata"/>
 				<post :hook_id="charactertweakdata"/>
 				<post :hook_id="guitweakdata"/>
+				<post :hook_id="dottweakdata"/>
+				<post :hook_id="firetweakdata"/>
 				<post :hook_id="groupaitweakdata"/>
 				<post :hook_id="playertweakdata"/>
 				<post :hook_id="weapontweakdata"/>