Refactor/circumvent followers