added better messages