modification for AOSPA-Legacy