as agreed on PR, will mention EAP instead of AS7.1