changes on notifications (not yet funtional)
merge