improved EOC management + new methods to AOP