updated to new NFC message handling