Use an event and dispatch it instead of adding event handlers the oth…

Use an event and dispatch it instead of adding event handlers the oth… #1254