More work on FindDuplicates