Updated to latest aopt