Retro AE changes from BD