first XYAOSP changes