refining AO and Issue #9