added some more listeners