#371 added AoE & No AoE