diff --git a/SQF/dayz_code/medical/epinephrine.sqf b/SQF/dayz_code/medical/epinephrine.sqf
index c39faaea8..75dbcd10e 100644
--- a/SQF/dayz_code/medical/epinephrine.sqf
+++ b/SQF/dayz_code/medical/epinephrine.sqf
@@ -14,10 +14,12 @@ if (!_isDead) then {
 	_unit setVariable ["NORRN_unconscious", false, true];
 	_unit setVariable ["USEC_isCardiac",false,true];
 	sleep 5;
-	//["usecEpi",[_unit,player,"ItemEpinephrine"]] call broadcastRpcCallAll;
-	//DayZ CE: Has been changed to PVC via server_sendToClient.sqf -> Could we also do here - Commit by Skaronator
 	usecEpi = [_unit,player,"ItemEpinephrine"];
 	publicVariable "usecEpi";
+	/* WIP - PVS/PVC - Skaronator
+	PVDZE_send = [_unit,"Epinephrine",[_unit,player,"ItemEpinephrine"]];
+	publicVariableServer "PVDZE_send";
+	*/
 };
 
 r_action = false;
\ No newline at end of file
diff --git a/SQF/dayz_code/medical/publicEH/medEpi.sqf b/SQF/dayz_code/medical/publicEH/medEpi.sqf
index 9abe142fd..28526502d 100644
--- a/SQF/dayz_code/medical/publicEH/medEpi.sqf
+++ b/SQF/dayz_code/medical/publicEH/medEpi.sqf
@@ -20,7 +20,8 @@ if (!_isDead) then {
 		r_player_cardiac = false;
 		r_player_handler1 = false;
 	};
-
+	
+	/* WIP - PVS/PVC - Not anymore used: moved to server_sendToClient.sqf - Skaronator */
 	if (isServer) then {
 		_unit setVariable["medForceUpdate",true];
 	};
diff --git a/SQF/dayz_code/medical/setup_functions_med.sqf b/SQF/dayz_code/medical/setup_functions_med.sqf
index a170509c1..c1fa45577 100644
--- a/SQF/dayz_code/medical/setup_functions_med.sqf
+++ b/SQF/dayz_code/medical/setup_functions_med.sqf
@@ -253,12 +253,6 @@ fnc_usec_recoverUncons = {
 	player setVariable ["USEC_isCardiac",false,true];
 	// player setVariable["medForceUpdate",true,true];
 
-	/*
-	sleep 1;
-	usecEpi = [player,player];
-	publicVariable "usecEpi";
-	*/
-
 	r_player_unconscious = false;
 	r_player_cardiac = false;
 	r_player_handler1 = false;
diff --git a/SQF/dayz_server/compile/server_sendToClient.sqf b/SQF/dayz_server/compile/server_sendToClient.sqf
index d9403508b..0519847ff 100644
--- a/SQF/dayz_server/compile/server_sendToClient.sqf
+++ b/SQF/dayz_server/compile/server_sendToClient.sqf
@@ -65,8 +65,9 @@ switch (_variable) do {
 	};
 
 	case "Epinephrine": {
-		PVCDZ_hlt_Epi = _arraytosend;
-		_owner publicVariableClient "PVCDZ_hlt_Epi";
+		usecEpi = _arraytosend;
+		_owner publicVariableClient "usecEpi";
+		//Don't forget!! Checkout dayz_code\medical\publicEH\medEpi.sqf #24
 		_unit setVariable["medForceUpdate",true];
 	};