diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp
index e8fef6baa..d724ef6f8 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp
@@ -68,8 +68,9 @@ class PartWoodPile : CA_Magazine
 	class ItemActions {
 		class Build {
 			text = $STR_ACTIONS_MAKEFIRE;
-			script = "spawn player_makeFire;"; //Do not use player_build because we have no ghost preview model for Land_Fire_DZ yet
-			use[] = {"PartWoodPile"};
+			script = "spawn player_build;";
+			require[] = {"ItemMatchbox"};
+			create = "Land_Fire_DZ";	
 		};
 		class Crafting
 		{
diff --git a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Fire.hpp b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Fire.hpp
index d8d1de2bd..c51396f07 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Fire.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/Buildings/Land_Fire.hpp
@@ -104,18 +104,9 @@ class Land_Fire_DZ : Land_Fire {
 		transportMaxMagazines = 1;
 		transportMaxWeapons = 0;
 		transportMaxBackpacks = 0;
+		offset[] = {0,1,0};
+		constructioncount = 1;
 	class UserActions {
-		/*
-		class upgrade {
-			displayNameDefault = "Create Base Fire";
-			displayName = "Create Base Fire";
-			position = "ohniste";
-			radius = 3;
-			onlyForPlayer = 0;
-			condition = "alive this";
-			statement = "[this] spawn object_upgradeFireplace";
-		};
-		*/
 		class lightup {
 			displayNameDefault = $STR_ACTIONS_LIGHTFIRE;
 			displayName = $STR_ACTIONS_LIGHTFIRE;
@@ -135,13 +126,6 @@ class Land_Fire_DZ : Land_Fire {
 			statement = "[this,false] call dayz_inflame";
 		};
 	};
-	/*
-	class Upgrade {
-		requiredTools[] = {"ItemEtool"}; 
-		requiredParts[] = {"ItemLog", "ItemLog", "ItemStone", "ItemStone", "ItemStone"};
-		create = "Base_Fire_DZ";
-	};
-	*/
 };
 	
 class Base_Fire_DZ : Land_Fire {
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp
index 9b3404ffe..00449c970 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp
@@ -25,12 +25,6 @@ class ItemMatchbox : ItemMatchbox_base
 	
 	class ItemActions
 	{
-		class Use
-		{
-			text = $STR_ACTIONS_MAKEFIRE;
-			script = "spawn player_makeFire;"; //Do not use player_build because we have no ghost preview model for Land_Fire_DZ yet
-			use[] = {"PartWoodPile"};
-		};
 		class Combine {
 			text = $STR_ANTIBIOTICS_COMBINE;
 			script = "spawn player_combineMatches;";
diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf
index a81cf7405..50283f05f 100644
--- a/SQF/dayz_code/init/compiles.sqf
+++ b/SQF/dayz_code/init/compiles.sqf
@@ -92,7 +92,7 @@ if (!isDedicated) then {
 	player_attachAttachment = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_attachAttachment.sqf";
 	player_removeAttachment = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_removeAttachment.sqf";
 	player_fillWater = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\water_fill.sqf";
-	player_makeFire = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_makefire.sqf";
+	//player_makeFire = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_makefire.sqf";
 	player_mineStone = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_mineStone.sqf";
 	if (DZE_modularBuild) then {
 		player_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\modular_build.sqf";
@@ -109,7 +109,7 @@ if (!isDedicated) then {
 	player_buildPlaceables = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_buildPlaceables.sqf";
 	fn_buildCamera = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_buildCamera.sqf";
 	object_build = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_build.sqf";
-	object_upgradeFireplace = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_upgradeFireplace.sqf";
+	//object_upgradeFireplace = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_upgradeFireplace.sqf";
 	player_wearClothes = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_wearClothes.sqf";
 	player_dropWeapon = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_dropWeapon.sqf";
 	object_pickup = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\object_pickup.sqf";