AOSPA Pie Modification (2/2)