commiting the final aop changes