GAPS with AIP option