Refactor + new method. helped by Evgenny