Solving AF2's Problems