Updated to event bubbling setup.