Refactor/extra