TODO:

- update the EA model to match the current implementation