more updates with AOP changes.