Fixing AO and using the new functions available for extensions.