Bring in line with AOSPA