More changes to the way NPC is handled