Added handling of repeat events