NFC Enhanced Update

We are using our vendors, not using rootbox.