Reimplemented this week into event list after it disappeared in a merge