added nodom changes and uniq_ids