cleaned up lots of duplicates