eventsHelper and some random changes