Maybe extract to new method?