diff --git a/addons/advanced_ballistics/XEH_postInit.sqf b/addons/advanced_ballistics/XEH_postInit.sqf
index 6416e7908a..1f9002e606 100644
--- a/addons/advanced_ballistics/XEH_postInit.sqf
+++ b/addons/advanced_ballistics/XEH_postInit.sqf
@@ -6,7 +6,7 @@ GVAR(currentbulletID) = -1;
 
 GVAR(Protractor) = false;
 GVAR(ProtractorStart) = ACE_time;
-
+GVAR(allBullets) = [];
 GVAR(currentGrid) = 0;
 
 GVAR(extensionAvailable) = true;
diff --git a/addons/advanced_ballistics/XEH_preInit.sqf b/addons/advanced_ballistics/XEH_preInit.sqf
index 12018ad412..f722d9c573 100644
--- a/addons/advanced_ballistics/XEH_preInit.sqf
+++ b/addons/advanced_ballistics/XEH_preInit.sqf
@@ -13,5 +13,5 @@ PREP(initializeTerrainExtension);
 PREP(initModuleSettings);
 PREP(readAmmoDataFromConfig);
 PREP(readWeaponDataFromConfig);
-
+PREP(handleFirePFH);
 ADDON = true;
diff --git a/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf b/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
new file mode 100644
index 0000000000..7f491a411e
--- /dev/null
+++ b/addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
@@ -0,0 +1,48 @@
+/*
+ * Author: Glowbal, Ruthberg, joko // Jonas
+ * Handle the PFH for Bullets
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Public: No
+ */
+#include "script_component.hpp"
+
+private "_deleted";
+
+
+
+_deleted = 0;
+
+{
+    private ["_bulletVelocity", "_bulletPosition", "_bulletSpeed"];
+    _x params["_bullet","_caliber","_bulletTraceVisible","_index"];
+
+    _bulletVelocity = velocity _bullet;
+
+    _bulletSpeed = vectorMagnitude _bulletVelocity;
+
+    if (!alive _bullet || _bulletSpeed < 100) exitWith {
+        GVAR(allBullets) deleteAt (_forEachIndex - _deleted);
+        _deleted = _deleted + 1;
+    };
+
+    _bulletPosition = getPosASL _bullet;
+
+    if (_bulletTraceVisible && _bulletSpeed > 500) then {
+        drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.02*_caliber,0.01*_caliber],[[0,0,0,0.65],[0,0,0,0.2]],[1,0],0,0,"","",""];
+    };
+
+    _aceTimeSecond = floor ACE_time;
+    call compile ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6:%7", _index, _bulletVelocity, _bulletPosition, ACE_wind, ASLToATL(_bulletPosition) select 2, _aceTimeSecond, ACE_time - _aceTimeSecond]);
+} forEach GVAR(allBullets);
+
+if (GVAR(allBullets) isEqualTo []) then {
+    diag_log "Remove PFH";
+    [_this select 1] call CBA_fnc_removePerFrameHandler;
+    GVAR(BulletPFH) = nil;
+};
diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf
index d93b6a4eac..42626f6019 100644
--- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf
+++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf
@@ -121,26 +121,9 @@ GVAR(currentbulletID) = (GVAR(currentbulletID) + 1) % 10000;
 _aceTimeSecond = floor ACE_time;
 "ace_advanced_ballistics" callExtension format["new:%1:%2:%3:%4:%5:%6:%7:%8:%9:%10:%11:%12:%13:%14:%15:%16:%17:%18", GVAR(currentbulletID), _airFriction, _ballisticCoefficients, _velocityBoundaries, _atmosphereModel, _dragModel, _stabilityFactor, _twistDirection, _muzzleVelocity, _transonicStabilityCoef, getPosASL _bullet, EGVAR(common,mapLatitude), EGVAR(weather,currentTemperature), EGVAR(common,mapAltitude), EGVAR(weather,currentHumidity), overcast, _aceTimeSecond, ACE_time - _aceTimeSecond];
 
-[{
-    private ["_args", "_index", "_bullet", "_caliber", "_bulletTraceVisible", "_bulletVelocity", "_bulletPosition"];
-    params ["_args","_idPFH"];
-    _args params["_bullet","_caliber","_bulletTraceVisible","_index"];
+GVAR(allBullets) pushBack [_bullet, _caliber, _bulletTraceVisible, GVAR(currentbulletID)];
 
-    _bulletVelocity = velocity _bullet;
-
-    _bulletSpeed = vectorMagnitude _bulletVelocity;
-
-    if (!alive _bullet || _bulletSpeed < 100) exitWith {
-        [_idPFH] call cba_fnc_removePerFrameHandler;
-    };
-
-    _bulletPosition = getPosASL _bullet;
-
-    if (_bulletTraceVisible && _bulletSpeed > 500) then {
-        drop ["\A3\data_f\ParticleEffects\Universal\Refract","","Billboard",1,0.1,getPos _bullet,[0,0,0],0,1.275,1,0,[0.02*_caliber,0.01*_caliber],[[0,0,0,0.65],[0,0,0,0.2]],[1,0],0,0,"","",""];
-    };
-
-    _aceTimeSecond = floor ACE_time;
-    call compile ("ace_advanced_ballistics" callExtension format["simulate:%1:%2:%3:%4:%5:%6:%7", _index, _bulletVelocity, _bulletPosition, ACE_wind, ASLToATL(_bulletPosition) select 2, _aceTimeSecond, ACE_time - _aceTimeSecond]);
-
-}, GVAR(simulationInterval), [_bullet, _caliber, _bulletTraceVisible, GVAR(currentbulletID)]] call CBA_fnc_addPerFrameHandler;
+if (isNil QGVAR(BulletPFH)) then {
+    diag_log "Add PFH";
+    GVAR(BulletPFH) = [FUNC(handleFirePFH), GVAR(simulationInterval), []] call CBA_fnc_addPerFrameHandler;
+};