Changed some of the listening logic