From 8bc8b1362df2919b55e5886ca2aa68a7927fba2a Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Sat, 18 Jun 2022 01:24:04 +0200
Subject: [PATCH] Merged ETR_CellStorageScript updates back to player aliases
 due to lower performance

---
 Artifact Tracker.esp                     | Bin 4860 -> 4708 bytes
 Scripts/ETR_CellStorageScript.pex        | Bin 2018 -> 481 bytes
 Scripts/ETR_TrackFoundItems.pex          | Bin 4528 -> 4471 bytes
 Scripts/ETR_TrackNewItems.pex            | Bin 3656 -> 3656 bytes
 Scripts/ETR_TrackStoredItems.pex         | Bin 3105 -> 3077 bytes
 Source/Scripts/ETR_CellStorageScript.psc |  57 -----------------------
 Source/Scripts/ETR_TrackFoundItems.psc   |  23 ++++++---
 Source/Scripts/ETR_TrackStoredItems.psc  |  13 ++++--
 8 files changed, 26 insertions(+), 67 deletions(-)

diff --git a/Artifact Tracker.esp b/Artifact Tracker.esp
index e8c2d36904a352bd72e2b725479da616f9b1fa01..43e9b3b8652ed7d5a929391d7e4b51dd5e3027d2 100644
GIT binary patch
delta 327
zcmeyP`b1@d8dEm!M2#$|RSXOa&i;NOK#Jj_4v2*Cs~9G(F`V4XEit*5F_`h<=7)^;
z8F@2HQgh2QOEQY{OH+zBpJnD_LKT{Pmf3W(ESmwEO0aN0dk-t)#mO?fxsxaGsZNe!
zlx7r~>?kNac`h&4WLZXu$qoFXlh5)=P1fU6o2<Yu4N@g1#Nd;k98y`38jzD%nOfwL
zUs{~X$jHF(|Nr8H{0x(y^Qqu4#F}3nWPmJQ118J!%S?X4D+RY6Xx?OPfsa7%$_myo
aO2NXz$2r8$5fU^EOdJeA`zLP|at8n+OJq_2

delta 328
zcmaE&@<(-o8WShSM2##dCq@PaXMevC1|Ybg10o@OA;yVo3{}H?9bG0dure?)FfxcT
zxP}D9JE!L41efF&C8nnaCl_TFlrXSNuI81V?8GlI`6G|RWJfNsiJwCmFKqT?ywAw%
zS(2I?o>`I+oL`y}JUM{XbaNK-O*G-n0j#NLLSU8O*?L$RFHCOX$(?M-D+e@O6>Lcj
zuhircKGDg%{L+)B@v2RJ&nJf=pU<xXSF@N;9i&EtlOZ4{u`;zNC^d}{=;#0cMHm<+
wf8bFA8w%0@G8km&Wd4sp=eG*fF-pM##K$?r&k+(f3``shj2Cn!%L=&z0HvN_f&c&j

diff --git a/Scripts/ETR_CellStorageScript.pex b/Scripts/ETR_CellStorageScript.pex
index f71411f6c36d0328c5566b7d4801c48e345ac2bb..d7f75ebfc95b176037cb7489e90ddf7f718ef21f 100644
GIT binary patch
delta 276
zcmaFF|BzYWSNMT@%uEc73_y^y`cTV60SiXKiJtn}+{yWQDVZgi`FV*s3~U*hDJiLW
z4E+8{S*gh-L8)n}MX7nosSGTB`FW|6pD?*;umzVCW#*+ba9UY`#KIDb7`XEDT=P<b
zOA<?f3X4;7(iqsStR@>Ui%hOy)ToD9Y01C@w3`u3f*H&pw=glVFfy=$#6cjNfep%n
z@EO7CnHks_IKc8iE++#QkmLpmF^e-Y@Gvs)0(oGgfDAsMJW!M$NmLYQ1s8(=L_3IN
Ilme;)08Ml(4gdfE

literal 2018
zcmc&!%TgOh6g@4;=#2~r954<8HX(Kr+2)}n+64kORW6)DDSJr`GcA}PdZ?L}`KIji
z0m&l2k#)WytDNrE2qBY7c2P?+_tE!pPT$sF?|=OxpMwBDr$7JsI~MnUJU-cz{eD-+
ziGL=$K@wf*)>RsyvLA-=AV~*(57RP}Ti22D@D1kg3}o8UE2+EM*AnGdv5uWsf2$6)
zygZhd@dp{A>eTPTkjm6~#J55<h*cQrC{}(Sjkl*i$v_{=o=l_)B$}O$sc5pK2k}6K
zCm;L-rCyv|_M=o|cFcbyudR2**?y2o$}Li{FAMSwHM?PcEXeqz%i0)Kaz@lf2ByaJ
zNVAPN4(}|2sjf~Ub%u?DfeH*XPoMkROQaqoDy1U5V2}`@_EO7PvD0yk6^>#hQSmQ!
z{Zty%C>#(gs(xg&JyM{NKjfp~UpQ_vs%ZFLrg|?{+K-e>Q0{b0ws$0q`5Arn0)^c;
z?q}*t6i<gxhZ{CC*B0)D@^o;9+EJ{dUKIES28yqJ9s~QS@wjgqDx|XCL&Kf3Jzl%1
zNYM%0edJ$COj)Ogrl(_X#HZ__g}KqVo%DvprI;PBbg0ZBV(wPBJ&qQ>y-jv{9qHg)
z8n&a<i|t&QFhhQNB?E$z;gJ54lGl#^O04!(=;T_gcI8>5oHpZMba^iVc|-7!wC#+v
z9ju!Q0q+$P+nMux6@COXyNAD_z?&nGGxyR6`AndF0~J)c>UK?I8V%gX3}#2Gi6$O!
zeS#&fhgilVd^)z)@EA|9K3pdMJuqR5>p9mZwy@1B?N$y`KvB5=i2N@oIf>5#%524c
zs+myBgnA|v*kHxQ6xng(Myayxk*7=qBc;auCV!5Q=3E8y6ib503Yd54KykssTqMjA
zftJ|oGTjF53Krq<y~^Jj^K2{%JQjE&ux!{AITRiUtP9iy9$AaP0%eaX9iIto2&`m|
zSz3oG7KQ=!iohxZsIQuRWrlq&P|hkapR-hNTb|mQt_!#48D9cxCJ7!=$l(h<jbxQC
zCt9bmX&YODd(;1wKx^1wPN2qw%xK%MPekW1^S?K4+b-S74jJSrjI%?&COG{UzMfAY
zCSSZk^LSzSHRJx0^S~N3<=MlgJ!)Igly1^b>(-c+_v0UCZkscg#|~%AWNR~Tm9cKB
ocCz8&Nmx0botFbX0gAx?<Dj&&L227TX>(B8{O0iWN5I>E14oir)Bpeg

diff --git a/Scripts/ETR_TrackFoundItems.pex b/Scripts/ETR_TrackFoundItems.pex
index b74a2dc97e89b9195e38535be2469e0b677fdcce..fa19f0cf0bc3e77f66d29aad8b5dd5a93eced408 100644
GIT binary patch
literal 4471
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

literal 4528
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
A6aWAK

diff --git a/Scripts/ETR_TrackNewItems.pex b/Scripts/ETR_TrackNewItems.pex
index 4cf21997870d4448835f8cecf949fdfac7610c43..885b79633a8be8cb54b131710bb268ca26b3ee20 100644
GIT binary patch
literal 3656
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

literal 3656
zcmbVN>r&fR5dMy_F&Kk^kdS*sX+m@35+Df%l43A~h5!YUbf(kE2<u=}Y>7%TguFo?
zrEk$U=uH2&zxxdRL%(w**%;Dxz>BTjJ-d7M+l%=7{jYzvBp|@g_Ah^xak;p)@nOp|
zOM9#Ga5<1we|X<7Ayc$0x90h^ih(W}^TUU>W8gdVoN;2fwj~*C24*19zT^gO$hNLI
z%Z?qOd(By|m`BoEaZPK<tV(q7gxAekmbB1OavjSKY}YX>Xx+7`bkMaSccdqslANp9
zrjNdSUfrvcTy$%W_2Izu(6-}x)r##0xP0P#GjKf_8uXq}6Qg#z8tRH4OO=`>7d^Kc
zpXBoSFi~EvO;cuxv2Z8!SeKs9yQD*?u4k6z3MFmVUUx%RbDFrO<j;B{TQ_9_$knAV
zfAlIvbCyW1x{k!uV$CV3f*HZC85sVd9h7#ZPs#QTcl$?K3XH&|C=GvKmh2r{T86LN
z)8@#-s5_g1XFFxI=kqG)JC-x!Iz`6{kCVQv>>!=bhho-s3bJfFp+q&?w?B%OWhYQZ
zN*Y75;JTGqd=fL`NUAm=Syrvja#G&7R^ez>Nx4_j^n%?*+mrsV^sBhT1f*wHjK{{J
z>y_Pr<u+77?8qQTf1XrT-xlqPM4D5i6c}o*iYJ4b=cuAcqg3-aORSWxLB`xGn7&lA
zgbveI&v}kifSkFfg!<?qx2B8PQ1qC4n_P{OoOhkTv>nMAjL?rGw;`+Ufz(s2GfFd8
z4YQvOHVD+-;XoN?>8Bb2TX_R1OK#W7$ga9PvrDFGYFxL8n3;^3r!n&^W}e5)6w-QD
zzyARlbJ49-+(S+)gk8^Xw9bvyxhLpnw#&`|i{pAnMfGG+1HwxBd%i?B5v*5gZ2UVl
z{7kNYZugUEZV&lJm0R}e?Sc`W^V;1{O0`?F(6_-^;ih=Y+-+3~wJB(|w$-YkjZeM9
zNRwNz{e29aiCRx8j-PGBw<TIP<bm`8T&lmHKI}wG;p4Uf#YXyTJ6lKla?Y_{%cDcr
zv$kBFNUuhv-bjr~wJ!S$(zKA_)Ar5n3g1jUj5AlMC;)!w8ofJz{~0O1^#l^?U8<Ot
zm`MUzbe*Cc6!mILI+k&bbVJik+`?_rfTk}nh%ZU^@gSmy2<Z_*dW?`pFdESqLVALb
z#u3saCh?T?jP#r|^%=?|rfI}9gP3M<lIBp*G!I1!nu<`Q3eXDvt>6t-v92kBv_P9W
z;wSwZ+Cxs8X3(Lus#Fov88clmlS6lC(-Ui2S;6io9?N-&`Y<>$=xYc)xZDsrait+-
z(ccid=q%XA7F=aB^he-2dm?a?s+N9%TLQN!>E3n<+~GO3#tAKwG}TF{04eq`?BHGY
z@E(SAr0g|;uLSN345&yVfd}0JgOPaLrTM`te5m8(8S95RfxFGtcTZVA61b<F6Z~mQ
z^8%*%Sb(8*@`A^G`fln|C(}<5?=T&skGM{h>|-5M5+g)0N>pQ<u5o@78q);*S{ZCo
zfQ5-K840h=G;3&+ZPq*$7!jCI8Q}(*1fKDiz@H0DHB2X1(0V3nR`O9rr<u<TD?Cg2
z1-~!xHRkv&P(RNRS>Rcb-!co3XNF8`v4NV^$n&lxfmZ_4x-1DSUlN!J#gFT(?u^o>
zX!ec3>nNo}0xOJmM)^h{b4IyJ)M3rf+_l!YYiQu)UF)B_t63S{)vRpXMWo+0%B==~
z_<Q)6Rs0K%1hd%?*o=_3X@jf+%hu1*BqbD`$B~15F-NxkVvgLvhGPghp1BBe?*AZX
zPD19KrOxFTLq4}-4EfxSF=Xu+_Haw!r9z=LaE?4*Pt)Wm70C7Kc`j&!c*X`>w24-V
z$c};MwSR$ye5-{8?Zk>M@Q;O54~Ed{RFnNXZC{M-ivq>az8KqIY1oG|HGlrjTr5OW
zk1iIXsaqEdK`%Y3x^Ln8ps(fl`1p@-Y}thH--{}a8bKOIEBZcKQNFJ`Re`ym+~rxl
hn=hhi{TEY0=c?zm>8Zs(9W{oiH~zm9Ae1nHe*lCjMQH#4

diff --git a/Scripts/ETR_TrackStoredItems.pex b/Scripts/ETR_TrackStoredItems.pex
index 1461883df3f25929445e04e1a970d64c7c59372d..0534f6f0a31505eb97aade086f499754333a2aeb 100644
GIT binary patch
literal 3077
zcmb7E*;X4z5WRyWBvt{&EKXu8-VF(6$B1koBq1ag1F@4QpRv@y1Tn*z8O-6E@)LQ>
zbMgWCkUZs9_sodIB<F;()m7EE_Uifb?Js|%x?q8S?|=UN2`0)%2k(x2yLomPdcJDa
zLUkU@Tm((@mRl|F(hn}%1q`Z~pSg0}0)E8kZFY2;tE%uYv_plSsuy~O?cQ^1t`lNt
z&)sj^*UE2rcB^WiE73H(rX4z-TROGf6NLd{nZtoP_dci=`i!{VYKhSF+?FF?yN&Ks
zhe{WN2kKb)%5AFkwqpmlUo1*)CDm?AN%n~<d2VPsuJYe~uzmE<i4pO@K=+j&I6<gf
zX08nylr%PX?D^+yN*FOv-JV@_rEf=X=qlc&+tS*6v1p29URsf{n{<op`}J_kW6kLe
z&ue3%SY+i#*B8p5x4g?hX?*rfU0->A3wLk$H`CGg{Zd|>2qs0kwE{ES+xmc!k3(ZH
zajR=VK9Nmq^dw~=z3aIOIs0s{-J&bx;vtHT?GatJSmYcp=Fq!k2lc3=NI8qNbQV3u
zqIi14v5a%XHTMID;Q7~OIV(;(R6f#yY9FK5KHIPZC1s<}cH}Iv<sniv{^ad5(IlII
z{NDSYR5R=-hV8RMZgaD<49G<Z&L!M@!Yw4+V!|yY+;YOLAl>AmCGsooXlL=z?U*F9
zY(Yf|zLPwpcgL4*Q&u^^2;WRnP|cO?L*6_9z4zKOOI9;uMDO_}U-6OM7%uv6dO<%U
zvih1U5cC>vx_j)^rV7I3QN)9qkD29|S&5lfF|!aei!rklGpk7tW-(L?%&r_M`}|x!
z1_MlP-{va~bv{yzPG+?db)gWR+F>EMa>C}R3Me^2!P7G=gdRmz2rg99Id)X55a{nq
z&Q({@=jAZ;9rpyio?CWXM#n`nOuy%Ds1wIE(zCzE^Hq51yAn<nnwP%hXS_!r$lq$n
z@}p*<OFo#wq+%v5(ume&!25BMsJej+K21nebTNZRq{pOZc%f+uLerYQgwTwp1^hQH
z!O#kXUTKmbInZ6{R@#J685K=6Y)4c_9XtP^UF>Umjf04~&|{%jLhvv1EBXwlL-u1p
zw7?+ph8c>P;g}i09dk8`yTY(rW4c%5Ct^?*lVo*>EQWBeBMjmb28nL^+1K${7{g~B
z*f8#Qgb6%g(8y+ljLe`L1*4K_eU68m$3rR}Gpo!XPYaL6c*uZL;})J!jzr7Cm_a-q
zurMk%nT|7Y_mpFOPE{9SPc2N){)L4p3(v(J?VoZ!N%%B}{tRE}k-x+&Ub3fiOn9ED
zEbwNL=Mrzl<1%k$%&XKD$*)mA#VGR@W|{81_)k-wqui_2bLMtFI&Oj%2x4kqS>WYj
zl-hy;F2=yzq=m07d}Cor5M3HPou@&h0g>7`O<&)#+D@6%)O=@Q_=aXwhta>2G}O!l
zLoW06@L)>)Cg3`Cf=%f=xni@66zFq9b2=Y3bD9@xOlCyqv?fNnAc}EnGSL+n$0ZA^
zf=Sbo+6+AmvQ?}6M-;1CjjehZYEy^Ob2A2O87p%1aZBh!CnYU0G5%*uEYlvY=f7-6
zS#L*$)30(1w)nqBew*7;=cY8s?+~%et&r`IjhSI>6*ihFRdhe^nWkG*ltnSbs<+7-
z+;)u1QeCH-6_^ES2$;>P6QTK3>`5ox9l0TXPdn5Y>BKEyi(n>Ij)P@rwNKeXRieO%
z9O#x7xor(zQ8ac99yNNn%R>M;=1xGFY95U^raXjdXX+YihFH~8H}INqCRQ5JM|sC=
zBkS*M<Bmk)Hu8>$y4l7ZW@@%^SFU9nnJi1wqEv61PT1?tCeh2ZhG(LIM`KTMUI%m|
zo^XgG{>ljD`}2M0`vHc2!+UDq-q0f5SsJkyON$up>s0gr<=b?GA4~)t<sM!A1$_b)
Ai2wiq

literal 3105
zcmZ`)=~mlT5dLIr%wjMxYmzo`o3?34o3JkmO$&srEM{wxwjms0UqHo397zs`C+g{2
z^hx@&r_az|{pMathL(DQG&A>`eXjENo8SLv$-n}CN5B2`9z#p}yNCOMQ$5>@{6N*#
zB6S`<y9lf3SgO_hMi4gYWpt~Ae|G75WgMdKHaj|PTT#(o<U|VXD}Lk~wzcA|d2WQB
zinm>Nu2it$JGB+(T#07GuR4+IdyA)zccRcmEOXdZ=l%y(L#GkvYc&z7zE^Vv?9|bE
z>Qd>UdsiK+KzUU)Uw54l{kAQ+=|W6Rhaa2(ZO49aUU$O?L$=MB`&SprB(v%_LZvbJ
zGj(<82Q}o6=A%`g`DGV;zmB498z@6*V9u$sTj;wMYT0jiHGNpRrrlDPTKCZCwp9=^
z1?90ve&C#_4N4mDzyKCiy&fMe`d;L?o(lANJ4-hr+S6Q6{8yzY{kJkR;@ceKu9)AN
z6S`B+x-b+{nI)lhFA7}m1do>+URCB%j!vDZ9H^)fcp(K<t~LS=B`Sw{8S=JmRw29P
zdkV8R?ZQhps-7w_bi=ZL^oy!S<;d55!V6V(k6l%ZJ+*o2GF~v-7H6+H+z#Jc@@jE}
zP}Pr7@Vy0f;(A8c;hZfvp^}|IRu%!Bjw{k4rxu}QjgO*pW)?5rCKM|=k#xOq$2r^M
zji{=0G-$JJdbt=KO}Vj@8&A23l$%Vssg#>exfx`uT!2)b<;FJ`0<Eq|H^1tH%Th#d
zdMyu+<3WTd@dl=)t$DIx$Wyl^_pMc5q%um<-gKm9#JQR}YMh|3<wtC|xs)iHi>S?X
z%sg4m4A5sKSPT>|`?c*t;d*=&m@7ND<_QEH#+#l4`~6CVQL~ra5$WX^VrD8~rW0m7
zVI~r0GGS&CW;X5K2zu5+b6572bAB!#r7kA7?Z{&4e54qiOdN6qgQD?15a0(_OY&ZJ
z>yhI3!#S(eYrI})OTJj5<82UKY(I()*1K-LBJoG|&zH#a!)PHRA6;Qu5+*BBN$Yap
z`5;MDtw0VRr6el4c#21)&q$B)MAI;Yo@)9ULeDgf<0ehQ&@^t+41~me8|ZNHR(b`Y
zrI?nnf>llH*obKpo7nmnRUni>yM+!3z+diHbQ(?vETBuYKsSnp>A@Xg*oqQ*jjAsJ
z^(V|g!VF@_VDh+2xDJu0<vjvop@94J9Shy;=TIUH;^QW401ui%A09S^e&VI~8I<vf
zi6&3$o`p|2Mwy2GS@@g?3tv#xGHBtkg)b@TL3a_$b84Sl)3W1_Ofo=L5AiEKzULUh
za}+SjlE&DNaSnHa?@69cF@{8#CSnG&u&IARevW5Px-E=Z7#ZM8!e%LtQtr^|QFA&L
zzpjJE31V*FSfF-7Of3uJ1~`!byY5<eY2jN7lY+=-@Nkg^u_iTcr?2lU3|pAe)!!$R
z!91VBX<>oR7A?Gr8^mx^G+MGyXljP3S+>x3Q$tMuHBFz+RzG{0X^)5{W<JeJ#TP3Z
zG<mO3Cx<QijL>lo<pl*sS=F2_i<u1bV2(AFbZK+C1iE6G(hJ?59OW4p$7>dB!DMyC
zGdX$~V8?C#GgfwDC0p^m4yCuk7|i8ZqS#yJ$xZv8rC8^fJ9*vi@T$%7s?G9p^<taL
zu|wT1PxrV4`|(1^l00P|8*B;_*wD4#i$hVdE{YyzSRrq4l?0ckdYfwIYj$EsCrBj`
znr}%w>7-j@H^l#-9cqm1!!2No!FK4JHhk@Hm>QI$@oTCrY)UW~ku%uRBKM4yY*I9K
z8;Nr%Vb=_sDL03`D`p%v&j{T%!``J=Gwi*%B3WQM)*|SNytvlwlKZpSobtYyn4xXz
zDI55H0+;c=X^xk%hjox#JlS}@x#oQ3d;ga6lUZfx?Jf78PJV2DBe+a&`E5uyf@`AD
y7GYeR^aI2HE>cVeKjCM*<DZ2CZi6iAfrWR>^FTL+w(lv&B13c=!~vVsL+w98U@U|H

diff --git a/Source/Scripts/ETR_CellStorageScript.psc b/Source/Scripts/ETR_CellStorageScript.psc
index 67408ed..cf850a0 100644
--- a/Source/Scripts/ETR_CellStorageScript.psc
+++ b/Source/Scripts/ETR_CellStorageScript.psc
@@ -1,58 +1 @@
 Scriptname ETR_CellStorageScript extends ObjectReference
-
-FormList Property ETR_ItemsNew Auto
-FormList Property ETR_ItemsFound Auto
-FormList Property ETR_ItemsStored Auto
-FormList Property ETR_PersistentStorageList Auto
-
-
-event OnItemRemoved(Form akBaseItem, int aiItemCount, ObjectReference akItemReference, ObjectReference akDestContainer)
-	Debug.Notification("OnItemRemoved")
-	bool bStored = ETR_ItemsStored.HasForm(akBaseItem)
-
-	if GetItemCount(akBaseItem) > 0
-		if ! bStored
-			ETR_ItemsFound.RemoveAddedForm(akBaseItem)
-			ETR_ItemsNew.RemoveAddedForm(akBaseItem)
-			ETR_ItemsStored.AddForm(akBaseItem)
-			Debug.Notification("Added " + akBaseItem.GetName() + " to ETR_ItemsStored.")
-		endif
-		return
-	endif
-
-	if Eddoursul_Functions.GetItemCountInList(ETR_PersistentStorageList, akBaseItem)
-		Debug.Notification("ETR_PersistentStorageList")
-		; do nothing
-		if ! bStored
-			ETR_ItemsFound.RemoveAddedForm(akBaseItem)
-			ETR_ItemsNew.RemoveAddedForm(akBaseItem)
-			ETR_ItemsStored.AddForm(akBaseItem)
-			Debug.Notification("Added " + akBaseItem.GetName() + " to ETR_ItemsStored.")
-		endif
-
-	else
-		ETR_ItemsNew.RemoveAddedForm(akBaseItem)
-		ETR_ItemsStored.RemoveAddedForm(akBaseItem)
-		ETR_ItemsFound.AddForm(akBaseItem)
-		Debug.Notification("Added " + akBaseItem.GetName() + " to ETR_ItemsFound.")
-
-	endif
-
-endevent
-
-
-event OnItemAdded(Form akBaseItem, int aiItemCount, ObjectReference akItemReference, ObjectReference akSourceContainer)
-
-	if ETR_ItemsStored.HasForm(akBaseItem)
-		return
-	endif
-
-	ETR_ItemsFound.RemoveAddedForm(akBaseItem)
-	ETR_ItemsNew.RemoveAddedForm(akBaseItem)
-	ETR_ItemsStored.AddForm(akBaseItem)
-
-	;UI.Invoke("HUD Menu", "_root.AHZWidgetContainer.AHZWidget.RefreshWidgets")
-
-	Debug.Notification("Added " + akBaseItem.GetName() + " to cell storage and ETR_ItemsStored.")
-
-endevent
diff --git a/Source/Scripts/ETR_TrackFoundItems.psc b/Source/Scripts/ETR_TrackFoundItems.psc
index 8da5421..a08ba63 100644
--- a/Source/Scripts/ETR_TrackFoundItems.psc
+++ b/Source/Scripts/ETR_TrackFoundItems.psc
@@ -27,8 +27,14 @@ EndEvent
 
 
 Event OnLocationChange(Location akOldLoc, Location akNewLoc)
-
 	bAtHome = akNewLoc && akNewLoc.HasKeyword(LocTypePlayerHouse)
+	RegisterForSingleUpdate(3.0) ; wait until followers load into the location
+endEvent
+
+
+Event OnUpdate()
+
+	;Debug.Notification("Follower index: " + iFollowerIndex)
 
 	int iCurrentFollowers = 0;
 	Actor[] aFollowers = Eddoursul_Functions.GetPlayerFollowers()
@@ -37,9 +43,12 @@ Event OnLocationChange(Location akOldLoc, Location akNewLoc)
 		i -= 1
 		if ! aFollowers[i].IsDead() && ! aFollowers[i].IsDisabled()
 			iCurrentFollowers += aFollowers[i].GetFormID()
+			;Debug.Notification("Follower ID: " + aFollowers[i].GetFormID())
 		endif
 	endwhile
 
+	;Debug.Notification("New follower index: " + iCurrentFollowers)
+
 	if iCurrentFollowers == iFollowerIndex
 		return
 	endif
@@ -72,7 +81,7 @@ Event OnLocationChange(Location akOldLoc, Location akNewLoc)
 	Eddoursul_Functions.AddAllFormsToList(ETR_ItemsNew, 27, None, ETR_ExcludeFromNew) ; books
 	Eddoursul_Functions.AddAllFormsToList(ETR_ItemsNew, 32, None, ETR_ExcludeFromNew) ; misc items
 
-endEvent
+EndEvent
 
 
 event OnItemRemoved(Form akBaseItem, int aiItemCount, ObjectReference akItemReference, ObjectReference akDestContainer)
@@ -85,14 +94,17 @@ event OnItemRemoved(Form akBaseItem, int aiItemCount, ObjectReference akItemRefe
 			endif
 		elseif ETR_PersistentStorageList.HasForm(akDestContainer)
 			ETR_ItemsFound.RemoveAddedForm(akBaseItem)
-			ETR_ItemsNew.RemoveAddedForm(akBaseItem)
 			ETR_ItemsStored.AddForm(akBaseItem)
-			Debug.Notification("Added " + akBaseItem.GetName() + " to ETR_ItemsStored")
+			return
+		elseif bAtHome && akDestContainer.GetParentCell() != PlayerRef.GetParentCell()
 			return
 		endif
 	endif
 
-	if bAtHome && (! akDestContainer || akDestContainer.GetParentCell() == PlayerRef.GetParentCell()) && Eddoursul_Functions.HasRefInCell(akBaseItem, None, true, ETR_PersistentStorageList)
+	if bAtHome && (akDestContainer || Eddoursul_Functions.HasRefInCell(akBaseItem, None, true, ETR_PersistentStorageList))
+
+		ETR_ItemsFound.RemoveAddedForm(akBaseItem)
+		ETR_ItemsStored.AddForm(akBaseItem)
 
 		ObjectReference cellStorage = Eddoursul_Functions.GetOrCreateCellStorage(PlayerRef, ETR_PersistentStorageList, ETR_CellStorageContainer)
 
@@ -102,7 +114,6 @@ event OnItemRemoved(Form akBaseItem, int aiItemCount, ObjectReference akItemRefe
 
 	elseif PlayerRef.GetItemCount(akBaseItem) == 0 && Eddoursul_Functions.GetItemCountInActors(Eddoursul_Functions.GetPlayerFollowers(), akBaseItem) == 0
 
-		Debug.Notification("Moving " + akBaseItem.GetName() + " to ETR_ItemsNew")
 		ETR_ItemsFound.RemoveAddedForm(akBaseItem)
 		ETR_ItemsStored.RemoveAddedForm(akBaseItem)
 		ETR_ItemsNew.AddForm(akBaseItem)
diff --git a/Source/Scripts/ETR_TrackStoredItems.psc b/Source/Scripts/ETR_TrackStoredItems.psc
index 7a838bb..b878e11 100644
--- a/Source/Scripts/ETR_TrackStoredItems.psc
+++ b/Source/Scripts/ETR_TrackStoredItems.psc
@@ -48,11 +48,11 @@ event OnItemRemoved(Form akBaseItem, int aiItemCount, ObjectReference akItemRefe
 
 	endif
 
-	if ! akDestContainer || akDestContainer.GetParentCell() == PlayerRef.GetParentCell()
+	if ((akDestContainer && akDestContainer.GetParentCell() == PlayerRef.GetParentCell()) || (! akDestContainer && Eddoursul_Functions.HasRefInCell(akBaseItem, None, true, ETR_PersistentStorageList)))
 
 		ObjectReference cellStorage = Eddoursul_Functions.GetOrCreateCellStorage(PlayerRef, ETR_PersistentStorageList, ETR_CellStorageContainer)
 
-		if cellStorage.GetItemCount(akBaseItem) == 0 && Eddoursul_Functions.HasRefInCell(akBaseItem, None, true, ETR_PersistentStorageList)
+		if cellStorage.GetItemCount(akBaseItem) == 0
 			cellStorage.AddItem(akBaseItem, 1, true)
 		endif
 
@@ -66,17 +66,22 @@ event OnItemAdded(Form akBaseItem, int aiItemCount, ObjectReference akItemRefere
 
 	if akSourceContainer && !(akSourceContainer as Actor) && ETR_PersistentStorageList.HasForm(akSourceContainer)
 		if Eddoursul_Functions.GetItemCountInList(ETR_PersistentStorageList, akBaseItem) == 0
-			Debug.Notification("Added " + akBaseItem.GetName() + " to ETR_ItemsFound")
 			ETR_ItemsStored.RemoveAddedForm(akBaseItem)
 			ETR_ItemsFound.AddForm(akBaseItem)
-			ETR_ItemsNew.RemoveAddedForm(akBaseItem)
 		endif
 
 	elseif bAtHome
 		ObjectReference cellStorage = Eddoursul_Functions.GetOrCreateCellStorage(PlayerRef, ETR_PersistentStorageList, ETR_CellStorageContainer)
 		int iCount = cellStorage.GetItemCount(akBaseItem)
+
 		if iCount > 0 && ! Eddoursul_Functions.HasRefInCell(akBaseItem, None, true, ETR_PersistentStorageList)
 			cellStorage.RemoveItem(akBaseItem, iCount, true)
+
+			if Eddoursul_Functions.GetItemCountInList(ETR_PersistentStorageList, akBaseItem) == 0
+				ETR_ItemsStored.RemoveAddedForm(akBaseItem)
+				ETR_ItemsFound.AddForm(akBaseItem)
+			endif
+
 		endif
 
 	endif