removed some more dups