added better notifications