Max dev

Man change to NPC. In this merge I hope it will not undo the file set up.