few changes before change in function recognition in unit row_na_str