add AAF based on a flag