NPC improved