some small changes for AKO