more work on new orgs sync