trying to make things work for AIO