port over removed reporting code from aae