DEBUG - edited NotificaionListener, joined two methods