Updating for better NFD/NFC