Addition of event triggering, removal of logging