Changes to work on AE data