nfc enhanced

Change-Id: Iebd044aad9e0f0b713d8eb00acae5f9a76f2f542