More NS updates