Comments for NA check improved