Simplified event listener
CS fix
Mark version