additional code changes for nbs