Small optimization around event listeners.
Resolve merge ocnflict