Added more NFC work.