[IMP] updating to reflect the last changes on AE