updates following aospa-legacy