switched back to global event handling