Remove embed conditions and don't use callback
Use context for adding event listener