Changes for MAED propagation