diff --git a/addons/main/functions/extract_data/fn_extract_callsign.sqf b/addons/main/functions/extract_data/fn_extract_callsign.sqf
index 76d9ac6..11149b2 100644
--- a/addons/main/functions/extract_data/fn_extract_callsign.sqf
+++ b/addons/main/functions/extract_data/fn_extract_callsign.sqf
@@ -3,15 +3,37 @@
 // function description: Gets the unit name or classname to be used as TAK callsign
 
 params["_unit"];
+
 private _callsign = "";
+
 if (roleDescription _unit != "") then {
 	_callsign = name _unit + " | " + roleDescription _unit;
 } else {
 	_callsign = name _unit;
 
 	if (_callsign == "Error: No unit") then {
-		_callsign = getText(configFile >> "CfgVehicles" >> typeOf _unit >> "displayName");
+		_callsign = getText (configFile >> "CfgVehicles" >> typeOf _unit >> "displayName");
 	};
 };
 
+if ((([_unit] call BIS_fnc_objectType) select 0) == "Vehicle") then {
+	_callsign = getText (configFile >> "CfgVehicles" >> typeOf _unit >> "displayName") + " | " + name _unit;
+};
+
+if (unitIsUAV _unit) then {
+	_callsign = getText (configFile >> "CfgVehicles" >> typeOf _unit >> "displayName");
+
+	if (isUAVConnected _unit) then {
+		_callsign = _callsign + "[ON]";
+	} else {
+		_callsign = _callsign + "[OFF]";
+	}
+};
+
+_pre_defined_callsign = _unit getVariable "_atak_callsign";
+
+if (!isNil "_pre_defined_callsign") then {
+	_callsign = _pre_defined_callsign;
+};
+
 _callsign
\ No newline at end of file