Listening on instead of after error
several updates