work in progress, events improvements