reorganizing
Revised for mahal of original aeBR class