Update NFC code

NFC code fixes made