migrating to EAP 3