edited to match new event