More updates to the newer npc script