finaly fixed notifications