Updated event listener

Updated event listener goes more easy on performance