added extra event handler.