more updates to organization, removed duplicates