Another pass of NS changes, DB