Updated with listeners