NPC Update Mask almost entirely refactored