Refactoring: draft full
only e