more modifications for the AOP class