refactored event, added organization