Enhancing Upconversion nanoparticle performance of NaYF4: Yb,Tm with doping optimization and shell addition and of NaYF4: Yb,Er with Yb,Nd shell addition