[IMP] NSE code review