Add AOSPAL part 2