NFC new tweaks