some aio improvements