Fight with refactor continued