more changes for aoba