Separating the two listeners

Just separated out the two listeners 

Stuart