Major Updates from AOSB source