Revert "Revert "Improve NFC operation""

This reverts commit 5240efe93aa9bacf181667fb098ed9af33a637b3.