Added better notification