APE6 preliminary review

Fixed