Update with listeners break up