Update to the NPC System