Some modifications in notifying