Improved the repeat events.