some modifications in the data structure AIF