added better notification