sync with new aalib