more changes, working on ndv3