ok, added better AP handling