modify AAE and types
add report