removed some duplicates