merged more changes for aNCR implementation