Bring in-line with aospal