removed more duplicates