Feature/ezra/ns number