Added sync logic and clean up for repeater