making AAF faster