Make AP more explicit