change add/remove, change some event names, change some variables names