Updated propagation implementation -- the wrong event handlers were firing