changes for event listeners
merge issue