Old vs. New NPCs Baked into Upscale