Working on AoE  need to test in in raid