Part 2 of tll AA effect improvments