Improved the AA interface