AOF Revised