Added post-threading AEPS counting