NPC improvement