fixes; new $NS structure