added more ns changes