AOSPA-ify