AF1 Improvement