Issue #13. Made event listeners more specific