Added variant for use with repeaters