(#8) Corrected duplicates