AE improvements