worked on updating status of events
merged conflicts