some changes for orgs