Work on NPC system