add and remove functionality in events finished