diff --git a/src/hacks/LagExploit.cpp b/src/hacks/LagExploit.cpp
index a93e3d28..d0ecdc69 100644
--- a/src/hacks/LagExploit.cpp
+++ b/src/hacks/LagExploit.cpp
@@ -58,7 +58,7 @@ bool ExploitActive() {
 
 static CatVar mini_lag_exploit(CV_INT, "lagexploit_mini", "0", "Mini Lag Exploit");
 static CatVar instant_weapon_switch(CV_SWITCH, "instant_weapon_switch", "0", "Instant weapon switch");
-static CatVar infinite_packs(CV_SWITCH, "infinite_healthpacks", "0", "Infinite Healthpacks", "Activate removecond when standing on healthpack while having not full HP");
+static CatVar infinite_packs(CV_SWITCH, "infinite_packs", "0", "Infinite Pickups", "Activate removecond when standing on pickups while having not full HP/Ammo");
 
 void CreateMove() {
 	if (CE_BAD(LOCAL_E)) return;
@@ -147,16 +147,24 @@ void CreateMove() {
 		amount = int(mini_lag_exploit);
 	}
 
-	// Infinite healthpacks (I'll probably have to move this somewhere else)
-	if (infinite_packs && CE_GOOD(LOCAL_E) && LOCAL_E->m_iHealth <= LOCAL_E->m_iMaxHealth) {
+	// Infinite pickups (I'll probably have to move this somewhere else)
+	if (infinite_packs && CE_GOOD(LOCAL_E)) {
 		ICollideable* p = RAW_ENT(LOCAL_E)->GetCollideable();
 		const Vector& max1 = p->OBBMaxs();
 		const Vector& min1 = p->OBBMins();
 		for (int i = 1; i < entity_cache::max; i++) {
 			CachedEntity* e = ENTITY(i);
 			if (e->m_iClassID != CL_CLASS(CBaseAnimating)) continue;
-			if (e->m_ItemType != ITEM_HEALTH_SMALL && e->m_ItemType != ITEM_HEALTH_MEDIUM && e->m_ItemType != ITEM_HEALTH_LARGE) continue;
-			if (e->m_flDistance < 54.0f) amount = 900;
+			if (e->m_flDistance > 54.0f) continue;
+			// Lag for health
+			if (LOCAL_E->m_iHealth <= LOCAL_E->m_iMaxHealth) {
+				if (e->m_ItemType == ITEM_HEALTH_SMALL || e->m_ItemType == ITEM_HEALTH_MEDIUM || e->m_ItemType == ITEM_HEALTH_LARGE) amount = 900;
+			}
+			// Lag for ammo / metal
+			if (LOCAL_E->m_iAmmo <= LOCAL_E->m_iMaxAmmo) {
+				if (e->m_ItemType == ITEM_AMMO_SMALL || e->m_ItemType == ITEM_AMMO_MEDIUM || e->m_ItemType == ITEM_AMMO_LARGE) amount = 900;
+			}
+			
 			// Not working for some reason?
 			/*ICollideable* c = RAW_ENT(e)->GetCollideable();
 			const Vector& max2 = c->OBBMaxs();
diff --git a/tf-settings/menu.json b/tf-settings/menu.json
index 29fdf5fe..0a8847c9 100644
--- a/tf-settings/menu.json
+++ b/tf-settings/menu.json
@@ -429,7 +429,7 @@
 					"removecond_stun",
 					"instant_decloak",
 					"instant_rezoom",
-					"infinite_healthpacks",
+					"infinite_packs",
 					"lagexploit_mini"
 				]
 			},