some modifications to also test on EAP