NPC Overhaul part 1