updated for ndr-3.0beta2pre2