diff --git a/cathook/src/entitycache.cpp b/cathook/src/entitycache.cpp
index 17307288..f90a346b 100644
--- a/cathook/src/entitycache.cpp
+++ b/cathook/src/entitycache.cpp
@@ -99,7 +99,7 @@ void CachedEntity::Update(int idx) {
 	} else if (m_iClassID == g_pClassID->CObjectTeleporter ||
 			   m_iClassID == g_pClassID->CObjectSentrygun ||
 			   m_iClassID == g_pClassID->CObjectDispenser) {
-		m_Type == EntityType::ENTITY_BUILDING;
+		m_Type = EntityType::ENTITY_BUILDING;
 	} else if (m_iClassID == g_pClassID->CTFProjectile_Arrow ||
 			   m_iClassID == g_pClassID->CTFProjectile_EnergyBall ||
 			   m_iClassID == g_pClassID->CTFProjectile_EnergyRing ||
diff --git a/cathook/src/gui/CMenuWindow.cpp b/cathook/src/gui/CMenuWindow.cpp
index 9f7571a5..c6519729 100644
--- a/cathook/src/gui/CMenuWindow.cpp
+++ b/cathook/src/gui/CMenuWindow.cpp
@@ -57,6 +57,7 @@ void CMenuWindow::AddElements() {
 	tab = GetTab("esp");
 	ADDCVAR(g_phESP->v_bEnabled);
 	if (TF) ADDCVAR(g_phESP->v_bShowTank);
+	if (TF) ADDCVAR(g_phESP->v_bBuildingESP);
 	ADDLABEL("Player ESP");
 	ADDCVAR(g_phESP->v_bBox);
 	ADDCVAR(g_phESP->v_bTeammates);
diff --git a/cathook/src/hacks/ESP.cpp b/cathook/src/hacks/ESP.cpp
index 195f2ea9..fa2c81d9 100644
--- a/cathook/src/hacks/ESP.cpp
+++ b/cathook/src/hacks/ESP.cpp
@@ -68,6 +68,7 @@ ESP::ESP() {
 	v_bShowName = new CatVar(CV_SWITCH, "esp_name", "1", "Name ESP", NULL, "Show name");
 	v_bShowClass = new CatVar(CV_SWITCH, "esp_class", "1", "Class ESP", NULL, "Show class");
 	v_bShowConditions = new CatVar(CV_SWITCH, "esp_conds", "1", "Conditions ESP", NULL, "Show conditions");
+	this->v_bBuildingESP = new CatVar(CV_SWITCH, "esp_buildings", "1", "Building ESP", NULL, "Show buildings");
 }
 
 #define ESP_HEIGHT 14
@@ -164,9 +165,10 @@ void ESP::ProcessEntity(CachedEntity* ent) {
 		if (v_bShowEntityID->GetBool()) {
 			ent->AddESPString("%i", ent->m_IDX);
 		}
+		ent->AddESPString("Type: %i", ent->m_Type);
 	}
 
-	if (v_bProjectileESP->GetBool() && (ent->m_bEnemy || (v_bTeammates->GetBool() && !v_bOnlyEnemyProjectiles->GetBool()))) {
+	if (ent->m_Type == ENTITY_PROJECTILE && v_bProjectileESP->GetBool() && (ent->m_bEnemy || (v_bTeammates->GetBool() && !v_bOnlyEnemyProjectiles->GetBool()))) {
 		if (ent->m_iClassID == g_pClassID->CTFProjectile_Rocket || ent->m_iClassID ==  g_pClassID->CTFProjectile_SentryRocket) {
 			if (v_iShowRockets->GetBool()) {
 				if (v_iShowRockets->GetInt() != 2 || ent->m_bCritProjectile) {
@@ -270,7 +272,30 @@ void ESP::ProcessEntity(CachedEntity* ent) {
 				ent->AddESPString("%im", (int)(ent->m_flDistance / 64 * 1.22f));
 			}
 		}
-	} else if (ent->m_iClassID == g_pClassID->C_Player && ent->m_bAlivePlayer) {
+	} else if (ent->m_Type == ENTITY_BUILDING && v_bBuildingESP->GetBool()) {
+		if (!ent->m_bEnemy && !v_bTeammates->GetBool()) return;
+		int level = CE_INT(ent, netvar.iUpgradeLevel);
+		const char* name = (ent->m_iClassID == g_pClassID->CObjectTeleporter ? "Teleporter" : (ent->m_iClassID == g_pClassID->CObjectSentrygun ? "Sentry Gun" : "Dispenser"));
+		if (v_bLegit->GetBool() && ent->m_iTeam != g_pLocalPlayer->team) {
+			if (ent->m_lLastSeen > v_iLegitSeenTicks->GetInt()) {
+				return;
+			}
+		}
+		ent->AddESPString("LV %i %s", level, name);
+		if (this->v_bShowHealthNumbers->GetBool()) {
+			ent->AddESPString("%i / %i HP", ent->m_iHealth, ent->m_iMaxHealth);
+			ent->GetESPString(ent->m_nESPStrings - 1).m_bColored = true;
+			if (v_bVisCheck->GetBool()) {
+				ent->GetESPString(ent->m_nESPStrings - 1).m_nColor = colors::Transparent(colors::Health(ent->m_iHealth, ent->m_iMaxHealth), ent->IsVisible() ? 1.0 : 0.5f);
+			} else {
+				ent->GetESPString(ent->m_nESPStrings - 1).m_nColor = colors::Health(ent->m_iHealth, ent->m_iMaxHealth);
+			}
+		}
+		if (this->v_bShowDistance->GetBool()) {
+			ent->AddESPString("%im", (int)(ent->m_flDistance / 64 * 1.22f));
+		}
+		return;
+	} else if (ent->m_Type == ENTITY_PLAYER && ent->m_bAlivePlayer) {
 		if (!(this->v_bSeeLocal->GetBool() && interfaces::iinput->CAM_IsThirdPerson()) &&
 			ent->m_IDX == interfaces::engineClient->GetLocalPlayer()) return;
 		int pclass = CE_INT(ent, netvar.iClass);
@@ -301,7 +326,11 @@ void ESP::ProcessEntity(CachedEntity* ent) {
 			if (this->v_bShowHealthNumbers->GetBool()) {
 				ent->AddESPString("%i / %i HP", ent->m_iHealth, ent->m_iMaxHealth);
 				ent->GetESPString(ent->m_nESPStrings - 1).m_bColored = true;
-				ent->GetESPString(ent->m_nESPStrings - 1).m_nColor = colors::Health(ent->m_iHealth, ent->m_iMaxHealth);
+				if (v_bVisCheck->GetBool()) {
+					ent->GetESPString(ent->m_nESPStrings - 1).m_nColor = colors::Transparent(colors::Health(ent->m_iHealth, ent->m_iMaxHealth), ent->IsVisible() ? 1.0 : 0.5f);
+				} else {
+					ent->GetESPString(ent->m_nESPStrings - 1).m_nColor = colors::Health(ent->m_iHealth, ent->m_iMaxHealth);
+				}
 			}
 			if (v_bShowConditions->GetBool() && TF) {
 				if (IsPlayerInvisible(ent)) {
@@ -325,23 +354,6 @@ void ESP::ProcessEntity(CachedEntity* ent) {
 			}
 		}
 		return;
-	} else if (ent->m_iClassID == g_pClassID->CObjectSentrygun || ent->m_iClassID == g_pClassID->CObjectDispenser || ent->m_iClassID == g_pClassID->CObjectTeleporter) {
-		if (!ent->m_bEnemy && !v_bTeammates->GetBool()) return;
-		int level = CE_INT(ent, netvar.iUpgradeLevel);
-		const char* name = (ent->m_iClassID == 89 ? "Teleporter" : (ent->m_iClassID == 88 ? "Sentry Gun" : "Dispenser"));
-		if (v_bLegit->GetBool() && ent->m_iTeam != g_pLocalPlayer->team) {
-			if (ent->m_lLastSeen > v_iLegitSeenTicks->GetInt()) {
-				return;
-			}
-		}
-		ent->AddESPString("LV %i %s", level, name);
-		if (this->v_bShowHealthNumbers->GetBool()) {
-			ent->AddESPString("%i / %i HP", ent->m_iHealth, ent->m_iMaxHealth);
-		}
-		if (this->v_bShowDistance->GetBool()) {
-			ent->AddESPString("%im", (int)(ent->m_flDistance / 64 * 1.22f));
-		}
-		return;
 	}
 }
 
diff --git a/cathook/src/hacks/ESP.h b/cathook/src/hacks/ESP.h
index aff3aa09..b597d5c2 100644
--- a/cathook/src/hacks/ESP.h
+++ b/cathook/src/hacks/ESP.h
@@ -21,6 +21,7 @@ public:
 	void ProcessEntity(CachedEntity* ent);
 	void ProcessEntityPT(CachedEntity* ent);
 	CatVar* v_bSeeLocal;
+	CatVar* v_bBuildingESP;
 	CatVar* v_bEnabled;
 	CatVar* v_bEntityESP;
 	CatVar* v_bTeammates;