updated listener section