added AA in or-modular