Fiddling with EAP types...