Solving AF1's problems