More work on the implementation of events