diff --git a/WeakAuras/Projects/NameplateStatus/export b/WeakAuras/Projects/NameplateStatus/export
index 18efcc0..540fe01 100644
--- a/WeakAuras/Projects/NameplateStatus/export
+++ b/WeakAuras/Projects/NameplateStatus/export
@@ -1 +1 @@
-!1I1EVjooq8Vlv6K6kTlfOD7Q70T)bTe2YwkfHdT3JEbmjoeVBiMZ2bA7PLp73m2jHafkO92tuv8JzgpEMFZGNXRMNRhr5rQxP25vo1Jm1JeG)bRorkw4rU62(T)JB762OJhzSqgWKxq9)AGumZJCrm)5NPYGLJCfIynhw6XBddvmTx3QEKNknEIKh4(0mMhPFZCbDPiwiHtQBnKKU1n))uZ)pdxudA2mQpd3Iq91CrIYOUAQuddG95j8SrHWqvKzmmtl5tMWKkR0DlwahgWgNggAvMRC60R1a4QPntPPsAD8uzXXTduwjRshZMZs0eGl(JEKHx2G4oK42OpiSuubiZIPpbcVG0EsMHuspNoGWnRbhgJgRJ8ij0PmvUMMMSs102L8fXPtti2REnpIKgWtvGvOkyitvSo8PWHogu3y(KepYLoDDD6BSlgbH2Bqt6ZMKzXazglOgNkW(q)yQsH8d3tFCXPPGZlxHS7U5Qk(ZSnxewECgwOSRSMXvwZ4kRzCLvR8EKyAQosiVDMELArt4tPAMrz8PX27RfDGRzh5emb8nK)oLkzlh1knoE5O7J4aBeP5oA9LbpbgwUpaBtNLZkbvBe(eBSzDFF(rcCvgkL5)tejOGauasWq7IkMVibadG6oLYtoCQlGKhg9ahsH2QAOlec)wHbucqpZKaWaO3j6wqmby1j9B0S9acCZK(Dyjtaiw3tpVAUjipi8S8fANyMdcvl8NdbjMd8dvpfHxCi6VlGpbeTgm29UR3YrFYArXq475bO4bZyOeOccROAQrw0eFW52cx16oix23XPlEbJd7j4yaqoqnfpLBVUXNBF(SpCTZ1MRuiFsoMaL0gSKTitoWeW1TXno960W1XWAaVeKcq4nwJ4lW0eAMmHgFx(TT(5gOEr6brQoMJ22Bh42PDxqSlOteTHuvvRZAeDDZfbBf)gWvySVl7ryYpXv9MpRuEV3vV6oUoL4ByOqcaYHZgQ5tzzZmaa)uLwmfPzWSamkjprsQm2JeP1Zu)YjNGkAfU4Kcf9KABnBzM48aGsGyy2KXBK6mpHAbXygXHSK5vGPsgKP)Jlh9pFRSiU4aY4Mb59i1kN971YeNF(2VZJvGOdwAMTy9K050)U3TCecogAqhdh0TT7WgnB608Ll335MBVd3OvFCNb9AcBT8ZHPjgJ3XMtt92LJmwD4Bmxp8vLkvEZYpVCK9dpmJaW0a2MJ26HF0Yr0KaRewosiFDwYuS1zshXswDQ5FIfqwticDq7Mgxdc4XjhJm9MxspQTwI3U82qUgaDHGBRG0b7sYBWzYQCia3xoeZP0dNx5tmDXKwctiAHm3PuT(I)ev9)YIb3nT5Fkmk4G3UF6T25pM7N3l9MmGggkUShaxZKIjsMsHOEdZhH3nU)rhaVqciXv8alFAz6HCE(r0KjzbUhilQiXcd9g3)RWW3E5wmaXwSilwX2x8X)JG9m6nyhddRHI2ASrgTVEWHHOkfwPqkCn3h1B6g2NLR8KnnHLZxD0EmwWMU8myke5HJpEh5fseAeILLVhEfywQQnw6xljuizB1k13N9Adb8XvcyNSeIhm3qBniL7zvxokqSFKB2LUis(OIiZJW82Oi3RmqtbISCEKR0QmS1EUH)4sF(FfZVh5COXcVMX5GIroWyhRf67uk7pMAxFwl867IOTU5wcHlMkz6uzsUIA28ffgUJYhttYOdZ)VN6rn7OSpq(79nq2QePJHAogFJiGHVG2pI5)1vpaf2pn7T1RxbS9Dy3rLC64y4DEKs)q9QWHT8R3zVi2g22wbLEmV32(nrDXVBowiIltb8RrFBBvuJp2(lMh1nhlXpo2(845mxlzMROTDdB9z5zViNGpppyl1sCgun0cOYQ7Lu4X)oXWpqBDvyzM(2kMiT4pImhWuun(AytjVRvUxOaTSopodFDWc6tEKIAZQ9Y65Jy8jrqzcNwptmgVuEv(BRADcfHlmBnb8KjMITRF6kImZYFnpulEI(LDb4WByacrqCRPo(NH6wXNQtST3y9c2WlUTo9pG9EjIgiw87fLqvBRELKcVITKylx)woxatt5sPWC4MQnPV5837ECR0fx1A9UgObPMknfIpf1wsTkvRGfpdgGad0GCrhNUnnQHpefZgUMB7f19wQ00DxLh4K95fo3cDOnITcHA(FOrqayGE4Eg9Rna8I6HEIfmPz4nSao9b7Q4))5xTy8Euj6jbWXxGqtEiGR640Y9al(FTY3T8rJNfzpLf2MbGqWYT9B9A53wZwyufQT59Q4G6pIHj3v0vQBm)Ge3Q218JrG2o59kTfZ2HtdY9aAfkg8M3)ftNa5jwmvM1LpjbQqpR7eoyEAhmcqzcPFfOywBZgQJGeprI4aVUNx1Q(ZHJ(S64P79V)
\ No newline at end of file
+!TI1)VTnUo8)xkWdyfynljTRdVdV9dPToBzlnniYT9U71Zjk2YXAZrkNKCs)cw(B)iLSDCttAZ2vSHulkskrYpKGubnc8di6asZAnoU2HbKPbKi8)a1jk5IaYNVyqN)8IE(T6gqglvrm1j0WVhPKZciNKYV)EQkA5iFPm1Wbs3ErCSMzc6vpGCxLVNO4r(3nJfqgCwHIovMkvWj1RbYsVM2Fp0(7rirdCZMrdz4weAOHlfA711qvg4dyFUGN)vm8PoX(nSYO4tMWuAN29ljGFgXgNfh7UmF2RB)2xcMMXUKMPOnXtLLM2js70SoBmBotyiGu8BdidpTfXFiXV1aqzz4fGmlLEhO8sw7Rywwj996ck3sdomgn1Keqe0PmDXnntS6QzCKcLPztfeNP3iGOOr8mn4fQdoYmnRlFkCOJHRBkFIiGCQxpFVbw)IvrO)gUjdytY9yGotLuBqfeFyykvRr5b7mejondcEfxi3URtvZVNTorG84CSq1qzdBOSHnu2WgkRx79iZ0mtIuDXmZQRfvWNsnm7LjKM6Sxh6aP5(YlAceBi)DgvXwoQDwA6YrxNWbXikRn6ILr3bowEiaBZMvikbV2i8j16Z69(IJeKQkukp(lKcurakazyOJOMfkfayaUUtPCXUZDjKC34hKqjnURggcH0VvyaTeUN5AaeaU3ctBiNa86KbToRZLeWYuHDzIjaeR3HhxVWfuKeEubHoc7AqPgz4CijXEGFO(Hi8Idz)9a8jGOnGZU)v9xo6topkMcFnpcvp4gJvaxqAf1qT6IkcHGBBKQlCqoDGNxp0atJ7l5ycqbqndpLl(ARV054zF4REF1AsX8jfycutRjsorM6sBcxVwN71VBlFpROr8kqkaH36rmFcwMWWucA6vfwBZJTq9YYdYmtkh9TxCPF3o9a1UGor2bkvvVjRvYxpBrKnV8za526vrCnwlWNDlS4)W19NdooDcnsU4pkceh0yl2yfHhglvakD4SHg(uw(klQimtBKtrEUCweM6uuDbYUKiWo0fJiT53YI2yDZCDeaqMi5W8fJxRiArP1sMXAJdzI51GLkguZ)Jlh9WpQQIt2HAV5G)asJQ1bFUAYfNV7VfznqEcll3b84Y1f8FWblhHWKHwCYWl71XFyRZoZ7SNsEG35xCfUr7b4ox2)myRLFjotyDEVXEA63UCK1vd)fR6d)PwTA7V8llh5(hpoNbW1a(M924HV3YrurKtdlhjvpVi5xShlKjHjwDQvpDeU7DlxB0VbzD)TXBX)sLqnxqueMAJNOc6OHK(C5FjjfRQuasF6qSYrFCDTpXmLlAlTjIL6CRA15N))iF)LvJpMa6TE4h7M41C(QpM702nzS10ScTYW2njdtOIj5jfgv2UkMorUWkJle8eHyquVKilvZEjm2pbG5x0z)Z4K3STgtbd5fyE7(Zn5fQM2U32S3CilSPpppkdGu873S)MtNes4akl7bTfLNXUgP)xfLc1CQxR5lL3TMc(4kfSvrIXdMB5Tbu55O6lhfj3o7Rz0LXP9kb27HLVqv(I64xPYYRxLMx1kp74z8VSo0RrDP)vLnELlz96vZCJ112PnFCLq7IYLkMjtjkSc7MpzMRTmzwMOs3tVWOE2D0UEp)vBQWnagDm0o)4ZLrmS50Wew43lVW4(z5TT(4HlDn2CfvXPJtHgNipuP3JYeRhEQVlVVsxbGoAOR(5937TpLpS1khtJHX5RYba2)XMgwfBz9B2UKMJtpNM663CoZ3XM1eFsNXRAUnVVwc2KB0gAt)OToVgJQXPpkg3zNgXYkK)k(Qmq3RK6wnX3RJcrxUcCQjgZm9V9U3HdLuJlFx5qjVRb27SMAqnAhJg8ZHqcbB4JMLmwIylVBNPyA9c6DbKYb)A80hliHXNKaJBCyZ8rsT40INqytpfaHIjmm3ygCXe7K8npCft2vfdiad6lmp9jg29xJatsWmx7JeCp4RWU)jUiam1t(uQ23lbTC3Ra8HMvEsQdAwFJysrjM0fQCZU97fI145Msl)bigAsaVCImnkOhog(uUsjT30Qt5w9LlmGUYuWhFdsX5Xq0PRxBWMH0CrKnhICsxVENHPyZs2Y82vgjUYE9Pk0xFsLdPdMLftdz30kkcI53CnJ(9waasFtF5cMY(55Sio9ghv83)7gF(MT7laGwiFfaJnfdwKg1QxR(o(Udp(Tex)5gw4cXLi0cGU9PfO7F879Ft7SfFUnWPufDTIcZH7LYJkdP7WJpU(llWfoBmVweFIageo3F4HvV9WaT2cZR(Sh2GPf3oh08rnrLh8p)
\ No newline at end of file
diff --git a/WeakAuras/Projects/NameplateStatus/trigger.lua b/WeakAuras/Projects/NameplateStatus/trigger.lua
index 665d11d..f5a1c00 100644
--- a/WeakAuras/Projects/NameplateStatus/trigger.lua
+++ b/WeakAuras/Projects/NameplateStatus/trigger.lua
@@ -1,30 +1,22 @@
 -- NAME_PLATE_UNIT_ADDED NAME_PLATE_UNIT_REMOVED FRAME_UPDATE
 function(states, event, unit, ...)
 	if event == "NAME_PLATE_UNIT_ADDED" and unit or event == "NAME_PLATE_UNIT_REMOVED" and unit then
-		local GUID = UnitGUID(unit)
-		if GUID then
+		if UnitExists(unit) then
 			local isPvp = UnitIsPVP(unit)
 			local nameplate = C_NamePlate.GetNamePlateForUnit(unit)
 
-			states[GUID] = {
-				GUID = GUID,
-				unit = unit,
-				frame = nameplate,
-				progressType = "static",
-				autoHide = true,
-				changed = true,
-				show = isPvp,
-			}
+			states[unit] = states[unit] or {}
+			states[unit].unit = unit
+			states[unit].frame = nameplate
+			states[unit].changed = true
+			states[unit].show = isPvp
 		end
 	elseif event == "NAME_PLATE_UNIT_REMOVED" and unit then
-		local GUID = UnitGUID(unit)
-		local state = states[GUID]
-		if state then
-			state.show = false
-			state.changed = true
-		end
-	end
-	if event == "FRAME_UPDATE" then
+		states[unit] = states[unit] or {}
+		states[unit].unit = unit
+		states[unit].show = false
+		states[unit].changed = true
+	elseif event == "FRAME_UPDATE" then
 		local theTime = GetTime()
 		if not aura_env.last or aura_env.last < theTime - 0.2 then
 			aura_env.last = theTime
@@ -32,12 +24,12 @@ function(states, event, unit, ...)
 				local unit = "nameplate" .. i
 				if UnitExists(unit) then
 					local isPvp = UnitIsPVP(unit)
-					local GUID = UnitGUID(unit)
-					local state = states[GUID]
-					if state then
-						state.show = isPvp
-						state.changed = true
-					end
+					local nameplate = C_NamePlate.GetNamePlateForUnit(unit)
+					states[unit] = states[unit] or {}
+					states[unit].unit = unit
+					states[unit].show = isPvp
+					states[unit].changed = true
+					states[unit].frame = nameplate
 				end
 			end
 		end