Updated code for NLP eval