Revert "Fixed problems"

This reverts commit b02b37dd138eed141dfa352acd2ecaf15abf0459.
about to order EBA