better logging
 better logging
changes on listener