Improve event listeners
Fix failed merge