GFI and AGFI added