fixing events for new implementation