Erin's NPCs Part II (updated)