Did testing of NHD2UZF, but kept as is. Added notes.