NBS-147 more changes for real good stuff