NPC refactor
NPC refactor