improved AP selection