Update for AOSPA PLUS