More repeater work