MOre work on orgs extract