diff --git a/plugins/l4d2_extraplayeritems.smx b/plugins/l4d2_extraplayeritems.smx
index 9890602..e0d6a23 100644
Binary files a/plugins/l4d2_extraplayeritems.smx and b/plugins/l4d2_extraplayeritems.smx differ
diff --git a/plugins/l4d2_randomizer.smx b/plugins/l4d2_randomizer.smx
index 92f9a9c..def22d1 100644
Binary files a/plugins/l4d2_randomizer.smx and b/plugins/l4d2_randomizer.smx differ
diff --git a/scripting/include/epi/director.sp b/scripting/include/epi/director.sp
index c685f93..dc2fa02 100644
--- a/scripting/include/epi/director.sp
+++ b/scripting/include/epi/director.sp
@@ -489,24 +489,9 @@ void DirectorSpawn(specialType special, int player = -1) {
 	}
 }
 
-// Finds a player that is suitable (lowest intensity)
-// TODO: biased random (lower intensity : bias)
-// dice roll, #sides = #players, sort list of players by intensity
-// then use biased left dice, therefore lower intensity = higher random weight
 int g_iLastVictim;
 int GetSuitableVictim() {
-	// TODO: randomize?
 	return GetRandomSurvivor(1, -1);
-	// ArrayList survivors = new ArrayList(2);
-	// for(int i = 1; i <= MaxClients; i++) {
-	// 	if(IsClientConnected(i) && IsClientInGame(i) && GetClientTeam(i) == 2 && IsPlayerAlive(i)) {
-	// 		int index = survivors.Push(i);
-	// 		survivors.Set(index, 1, L4D_GetPlayerIntensity(i));
-	// 	}
-	// }
-	// // Soe
-	// survivors.SortCustom()
-
 	int victim = -1;
 	float lowestIntensity = 0.0;
 	for(int i = 1; i <= MaxClients; i++) {
diff --git a/scripting/include/jutils.inc b/scripting/include/jutils.inc
index ec2efea..8c13e79 100644
--- a/scripting/include/jutils.inc
+++ b/scripting/include/jutils.inc
@@ -884,6 +884,7 @@ stock bool IsAreaClear(const float pos[3], const float ang[3], const float minBo
 }
 
 stock Action Timer_KillEntity(Handle h, int entity) {
+	
 	RemoveEntity(entity);
 	return Plugin_Handled;
 }
diff --git a/scripting/l4d2_extraplayeritems.sp b/scripting/l4d2_extraplayeritems.sp
index 22157e0..7c0080c 100644
--- a/scripting/l4d2_extraplayeritems.sp
+++ b/scripting/l4d2_extraplayeritems.sp
@@ -55,11 +55,6 @@
 #undef REQUIRE_PLUGIN
 #include <CreateSurvivorBot>
 
-#define L4D2_WEPUPGFLAG_NONE            (0 << 0)
-#define L4D2_WEPUPGFLAG_INCENDIARY      (1 << 0)
-#define L4D2_WEPUPGFLAG_EXPLOSIVE       (1 << 1)
-#define L4D2_WEPUPGFLAG_LASER 			(1 << 2)  
-
 #define AMMOPACK_ENTID 0
 #define AMMOPACK_USERS 1
 
@@ -1779,7 +1774,7 @@ Action Timer_UpdateHud(Handle h) {
 void PopulateItems() {
 	if(g_areItemsPopulated) return;
 	UpdateSurvivorCount();
-	PrintToServer("[EPI:TEMP] PopulateItems hasRan=%b finale=%b willRun=%b players=%d", g_areItemsPopulated, L4D_IsMissionFinalMap(true), !g_areItemsPopulated&&IsEPIActive, g_realSurvivorCount);
+	PrintToServer("[EPI:TEMP] PopulateItems hasRan=%b finale=%b willRun=%b players=%d", g_areItemsPopulated, L4D_IsMissionFinalMap(true), !g_areItemsPopulated&&IsEPIActive(), g_realSurvivorCount);
 	if(!IsEPIActive()) return;
 
 	g_areItemsPopulated = true;
@@ -1821,6 +1816,20 @@ void PopulateItems() {
 	PopulateCabinets();
 }
 
+int CalculateExtraDefibCount() {
+	if(L4D_IsMissionFinalMap()) {
+		int maxCount = g_survivorCount - 4;
+		if(maxCount < 0) maxCount = 0;
+
+		return DiceRoll(0, maxCount, 2, BIAS_LEFT);
+	} else if(g_survivorCount > 4) {
+		float chance = float(g_survivorCount) / 64.0;
+		return GetRandomFloat() > chance ? 1 : 0;
+	} else {
+		return 0;
+	}
+}
+
 void PopulateItemSpawns(int minWalls = 4) {
 	ArrayList navs = new ArrayList();
 	L4D_GetAllNavAreas(navs);
@@ -1837,6 +1846,9 @@ void PopulateItemSpawns(int minWalls = 4) {
 	float mapFlowMax = L4D2Direct_GetMapMaxFlowDistance();
 	PrintToServer("[EPI] PopulateItemSpawns: flow[0, %f]", mapFlowMax);
 	int maxSpawns = RoundFloat(mapFlowMax / MAX_RANDOM_SPAWNS);
+	int defibCount = CalculateExtraDefibCount();
+	bool isFinale = L4D_IsMissionFinalMap();
+
 	for(int i = 0; i < navs.Length; i++) {
 		Address nav = navs.Get(i);
 		int spawnFlags = L4D_GetNavArea_SpawnAttributes(nav);
@@ -1866,8 +1878,19 @@ void PopulateItemSpawns(int minWalls = 4) {
 					}
 					if(wpn == -1) continue;
 					if(++count >= maxSpawns) break;
+				} else if(defibCount > 0) {
+					if(isFinale) {
+						if(spawnFlags & NAV_SPAWN_FINALE) {
+							CreateWeaponSpawn(pos, "weapon_defibrilator", tier);
+							defibCount--;
+						}
+					} else {
+						CreateWeaponSpawn(pos, "weapon_defibrilator", tier);
+						defibCount--;
+					}
 				}
 			}
+			
 		}
 	}
 	PrintToServer("[EPI] Spawned %d/%d new item spawns (tier=%d)", count, maxSpawns, tier);