AF 1 Improvement even more continued