Much better NPCs