Changed to use new event trigger signature