Anmn nrs dar yon refactored

Good to go too, looks like also a link problem to the metadata record.