my changes to listener