diff --git a/addons/attach/functions/fnc_attach.sqf b/addons/attach/functions/fnc_attach.sqf
index 6486a55d5f..0cb2030caf 100644
--- a/addons/attach/functions/fnc_attach.sqf
+++ b/addons/attach/functions/fnc_attach.sqf
@@ -21,35 +21,35 @@ PARAMS_3(_attachToVehicle,_unit,_args);
 
 private ["_item", "_itemVehClass", "_onAtachText", "_selfAttachPosition"];
 
-_itemName = [_args, 0, ""] call CBA_fnc_defaultParam;
+_itemClassname = [_args, 0, ""] call CBA_fnc_defaultParam;
 
 //Sanity Check (_unit has item in inventory, not over attach limit)
-if ((_itemName == "") || {!(_this call FUNC(canAttach))}) exitWith {ERROR("Tried to attach, but check failed");};
+if ((_itemClassname == "") || {!(_this call FUNC(canAttach))}) exitWith {ERROR("Tried to attach, but check failed");};
 
 _itemVehClass = "";
 _onAtachText = "";
 _selfAttachPosition = [_unit, [-0.05, 0, 0.12], "rightshoulder"];
 
 switch (true) do {
-    case (_itemName == "ACE_IR_Strobe_Item"): {
+case (_itemClassname == "ACE_IR_Strobe_Item"): {
         _itemVehClass = "ACE_IR_Strobe_Effect";
         _onAtachText = localize "STR_ACE_Attach_IrStrobe_Attached";
         //_selfAttachPosition = [_unit, [0, -0.11, 0.16], "pilot"];  //makes it attach to the head a bit better, shoulder is not good for visibility - eRazeri
     };
-    case (_itemName == "B_IR_Grenade"): {
+case (_itemClassname == "B_IR_Grenade"): {
         _itemVehClass = "B_IRStrobe";
         _onAtachText = localize "STR_ACE_Attach_IrGrenade_Attached";
     };
-    case (_itemName == "O_IR_Grenade"): {
+case (_itemClassname == "O_IR_Grenade"): {
         _itemVehClass = "O_IRStrobe";
         _onAtachText = localize "STR_ACE_Attach_IrGrenade_Attached";
     };
-    case (_itemName == "I_IR_Grenade"): {
+case (_itemClassname == "I_IR_Grenade"): {
         _itemVehClass = "I_IRStrobe";
         _onAtachText = localize "STR_ACE_Attach_IrGrenade_Attached";
     };
-    case (toLower _itemName in ["chemlight_blue", "chemlight_green", "chemlight_red", "chemlight_yellow"]): {
-        _itemVehClass = _itemName;
+case (toLower _itemClassname in ["chemlight_blue", "chemlight_green", "chemlight_red", "chemlight_yellow"]): {
+        _itemVehClass = _itemClassname;
         _onAtachText = localize "STR_ACE_Attach_Chemlight_Attached";
     };
 };
@@ -57,38 +57,49 @@ switch (true) do {
 if (_itemVehClass == "") exitWith {ERROR("no _itemVehClass for Item");};
 
 if (_unit == _attachToVehicle) then {  //Self Attachment
-    _unit removeItem _itemName;  // Remove item
+    _unit removeItem _itemClassname;  // Remove item
     _attachedItem = _itemVehClass createVehicle [0,0,0];
     _attachedItem attachTo _selfAttachPosition;
     [_onAtachText] call EFUNC(common,displayTextStructured);
     _attachToVehicle setVariable [QGVAR(Objects), [_attachedItem], true];
-    _attachToVehicle setVariable [QGVAR(ItemNames), [_itemName], true];
+    _attachToVehicle setVariable [QGVAR(ItemNames), [_itemClassname], true];
 } else {
-    GVAR(setupObject) = _itemVehClass createVehicleLocal [0,0,-10000];
-    GVAR(setupObject) enableSimulationGlobal false;
-    GVAR(SetupPlacmentText) = _onAtachText;
-    GVAR(SetupPlacmentItem) = _itemName;
-    GVAR(SetupAttachVehicle) = _attachToVehicle;
-    GVAR(placer) = _unit;
+    GVAR(placeAction) = -1;
+
+    _tempObject = _itemVehClass createVehicleLocal [0,0,-10000];
+    _tempObject enableSimulationGlobal false;
+
     [_unit, QGVAR(vehAttach), true] call EFUNC(common,setForceWalkStatus);
 
-    [QGVAR(PlacementEachFrame),"OnEachFrame", {
-        private "_player";
-        _player = ACE_player;
-        //Stop if player switch or player gets to far from vehicle
-        if (GVAR(placer) != _player || {_player distance GVAR(SetupAttachVehicle) > 7}) exitWith {
-            call FUNC(placeCancel);
-        };
-        GVAR(pfeh_running) = true;
-        _pos = (ASLtoATL eyePos _player) vectorAdd (positionCameraToWorld [0,0,1] vectorDiff positionCameraToWorld [0,0,0]);
-        GVAR(setupObject) setPosATL _pos;
-    }] call BIS_fnc_addStackedEventHandler;     // @todo replace with CBA PFH
-
-    //had to delay the mouseHint, not sure why
-    // [{[localize "STR_ACE_Attach_PlaceAction", localize "STR_ACE_Attach_CancelAction"] call EFUNC(interaction,showMouseHint)}, [], 0, 0] call EFUNC(common,waitAndExecute);
-    //RMB is unusable for now, so don't show it:
+    //MenuBack isn't working for now (localize "STR_ACE_Attach_CancelAction")
     [{[localize "STR_ACE_Attach_PlaceAction", ""] call EFUNC(interaction,showMouseHint)}, [], 0, 0] call EFUNC(common,waitAndExecute);
+    _unit setVariable [QGVAR(placeActionEH), [_unit, "DefaultAction", {true}, {GVAR(placeAction) = 1;}] call EFUNC(common,AddActionEventHandler)];
+    // _unit setVariable [QGVAR(cancelActionEH), [_unit, "MenuBack", {true}, {GVAR(placeAction) = 0;}] call EFUNC(common,AddActionEventHandler)];
 
-    _unit setVariable [QGVAR(placeActionEH), [_unit, "DefaultAction", {GVAR(pfeh_running) && {!isNull (GVAR(setupObject))}}, {call FUNC(placeApprove);}] call EFUNC(common,AddActionEventHandler)];
-    // _unit setVariable [QGVAR(cancelActionEH), [_unit, "MenuBack", {GVAR(pfeh_running) && {!isNull (GVAR(setupObject))}}, {call FUNC(placeCancel);}] call EFUNC(common,AddActionEventHandler)];
+    [{
+        PARAMS_2(_args,_pfID);
+        EXPLODE_6_PVT(_args,_unit,_attachToVehicle,_itemClassname,_itemVehClass,_tempObject,_onAtachText);
+
+        if ((GVAR(placeAction) != -1) ||
+                {_unit != ACE_player} ||
+                {!([_unit, _attachToVehicle, []] call EFUNC(common,canInteractWith))} ||
+                {!([_attachToVehicle, _unit, _itemClassname] call FUNC(canAttach))}) then {
+
+            systemChat "exiting";
+
+            [_pfID] call CBA_fnc_removePerFrameHandler;
+            [_unit, QGVAR(vehAttach), false] call EFUNC(common,setForceWalkStatus);
+            [] call EFUNC(interaction,hideMouseHint);
+            [_unit, "DefaultAction", (_unit getVariable [QGVAR(placeActionEH), -1])] call EFUNC(common,removeActionEventHandler);
+            //[_unit, "MenuBack", (_unit getVariable [QGVAR(cancelActionEH), -1])] call EFUNC(common,removeActionEventHandler);
+
+            if (GVAR(placeAction) == 1) then {
+                _startingPosition = _tempObject modelToWorld [0,0,0];
+                [_unit, _attachToVehicle, _itemClassname, _itemVehClass, _onAtachText, _startingPosition] call FUNC(placeApprove);
+            };
+            deleteVehicle _tempObject;
+        } else {
+            _tempObject setPosATL ((ASLtoATL eyePos _unit) vectorAdd (positionCameraToWorld [0,0,1] vectorDiff positionCameraToWorld [0,0,0]));;
+        };
+    }, 0, [_unit, _attachToVehicle, _itemClassname, _itemVehClass, _tempObject, _onAtachText]] call CBA_fnc_addPerFrameHandler;
 };