Refactoring 2.
Including parEAs partialy.