removed some dupes