Worked on the events controller