Notifications fixed , only map incorporation left