Changes for AOSPA