Introduced addEventListener calls instead of setTimeout