added first part of the aoe system