Refactored escalating repeater