Adapt EA

Adapt EA