minor changes to the listeners
merging